Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-03-22 16:18:16 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-22 16:18:16 +0300
commitbe750e2aeebb8d0016675e52481a946cfc471629 (patch)
tree840a52ac8d9f3e42380a623c6167e9e0a834ca3c /source/blender/editors/interface/interface_panel.c
parent8f3ecd08e1e458cd9de06f17cecd38ce535d2048 (diff)
Cleanup: minor UI code changes
- Rename ui_but_find_active_in_region -> ui_region_find_active_but - Remove ui_but_is_active (use ui_region_find_active_but instead) - Re-order ui_but_* functions take the button as their first arg.
Diffstat (limited to 'source/blender/editors/interface/interface_panel.c')
-rw-r--r--source/blender/editors/interface/interface_panel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 1897d07d224..dfcae82fd51 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -2250,8 +2250,9 @@ int ui_handler_panel_region(bContext *C, const wmEvent *event, ARegion *ar, cons
}
/* on active button, do not handle panels */
- if (ui_but_is_active(ar))
+ if (ui_region_find_active_but(ar) != NULL) {
continue;
+ }
if (ELEM(mouse_state, PANEL_MOUSE_INSIDE_CONTENT, PANEL_MOUSE_INSIDE_HEADER)) {