archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: multi-value-edit, tint button while editing

Browse Source 
Currently re-uses node-flag (which is only used to tint color too)
This commit is contained in:
Campbell Barton
2015-05-13 09:58:05 +10:00
parent 91ec8d8d1e
commit 898b6491ed
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/interface/interface_handlers.c
View File

@@ -185,12 +185,17 @@ typedef struct uiSelectContextStore {
static bool ui_selectcontext_begin(
bContext *C, uiBut *but, struct uiSelectContextStore *selctx_data);
static void ui_selectcontext_end(
uiBut *but, uiSelectContextStore *selctx_data);
static void ui_selectcontext_apply(
bContext *C, uiBut *but, struct uiSelectContextStore *selctx_data,
const double value, const double value_orig);
#define IS_ALLSELECT_EVENT(event) ((event)->alt != 0)
/* just show a tinted color so users know its activated */
#define UI_BUT_IS_SELECT_CONTEXT UI_BUT_NODE_ACTIVE
#endif /* USE_ALLSELECT */
@@ -1426,9 +1431,25 @@ finally:
/* caller can clear */
selctx_data->do_free = true;
if (success) {
but->flag |= UI_BUT_IS_SELECT_CONTEXT;
}
return success;
}
static void ui_selectcontext_end(
uiBut *but, uiSelectContextStore *selctx_data)
{
if (selctx_data->do_free) {
if (selctx_data->elems) {
MEM_freeN(selctx_data->elems);
}
}
but->flag &= ~UI_BUT_IS_SELECT_CONTEXT;
}
static void ui_selectcontext_apply(
bContext *C, uiBut *but, uiSelectContextStore *selctx_data,
const double value, const double value_orig)
@@ -7606,11 +7627,7 @@ static void button_activate_exit(
MEM_freeN(data->origstr);
#ifdef USE_ALLSELECT
if (data->select_others.do_free) {
if (data->select_others.elems) {
MEM_freeN(data->select_others.elems);
}
}
ui_selectcontext_end(but, &data->select_others);
#endif
/* redraw (data is but->active!) */