northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-ability to scale and modulate texturebutton, closes #818

Browse Source 
-fixed bug in ordering of modal subwindows, closes #1001
This commit is contained in:
Juan Linietsky
2015-01-03 00:23:14 -03:00
parent d722537154
commit 0df45672e7
3 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/control.cpp
View File

@ -768,6 +768,12 @@ Control* Control::_find_control_at_pos(CanvasItem* p_node,const Point2& p_global
c->_window_sort_subwindows(); // sort them
int idx=0;
for (List<Control*>::Element *E=c->window->subwindows.front();E;E=E->next()) {
if (!E->get()->is_visible())
continue;
}
for (List<Control*>::Element *E=c->window->subwindows.back();E;E=E->prev()) {
Control *sw = E->get();
@ -1126,6 +1132,7 @@ void Control::_window_input_event(InputEvent p_event) {
over = _find_control_at_pos(this,pos,parent_xform,window->focus_inv_xform);
}
if (window->drag_data.get_type()==Variant::NIL && over && !window->modal_stack.empty()) {
Control *top = window->modal_stack.back()->get();
@ -2267,6 +2274,7 @@ void Control::_window_sort_subwindows() {
return;
window->modal_stack.sort_custom<CComparator>();
window->subwindows.sort_custom<CComparator>();
window->subwindow_order_dirty=false;
}