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

code cleanup: minor refactor of button pressed state checking, needed for drag toggle fix.

Browse Source
This commit is contained in:
Campbell Barton
2013-03-01 00:19:32 +00:00
parent 681b2ec49c
commit 3d63b2308a
2 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/blender/editors/interface/interface.c
View File

@@ -1097,34 +1097,29 @@ void uiDrawBlock(const bContext *C, uiBlock *block)
/* ************* EVENTS ************* */
static void ui_is_but_sel(uiBut *but, double *value)
int ui_is_but_push_ex(uiBut *but, double *value)
{
short is_push = 0; /* (0 == UNSELECT), (1 == SELECT), (2 == DO-NOHING) */
short is_true = TRUE;
if (ELEM3(but->type, TOGN, ICONTOGN, OPTIONN)) {
is_true = FALSE;
}
int is_push = false; /* (0 == UNSELECT), (1 == SELECT), (-1 == DO-NOHING) */
if (but->bit) {
const bool state = ELEM3(but->type, TOGN, ICONTOGN, OPTIONN) ? false : true;
int lvalue;
UI_GET_BUT_VALUE_INIT(but, *value);
lvalue = (int)*value;
if (UI_BITBUT_TEST(lvalue, (but->bitnr))) {
is_push = is_true;
is_push = state;
}
else {
is_push = !is_true;
is_push = !state;
}
}
else {
switch (but->type) {
case BUT:
is_push = 2;
break;
case HOTKEYEVT:
case KEYEVT:
is_push = 2;
case COLOR:
is_push = -1;
break;
case TOGBUT:
case TOG:
@@ -1134,42 +1129,48 @@ static void ui_is_but_sel(uiBut *but, double *value)
case ICONTOG:
case OPTION:
UI_GET_BUT_VALUE_INIT(but, *value);
if (*value != (double)but->hardmin) is_push = 1;
if (*value != (double)but->hardmin) is_push = true;
break;
case ICONTOGN:
case TOGN:
case OPTIONN:
UI_GET_BUT_VALUE_INIT(but, *value);
if (*value == 0.0) is_push = 1;
if (*value == 0.0) is_push = true;
break;
case ROW:
case LISTROW:
UI_GET_BUT_VALUE_INIT(but, *value);
/* support for rna enum buts */
if (but->rnaprop && (RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG)) {
if ((int)*value & (int)but->hardmax) is_push = 1;
if ((int)*value & (int)but->hardmax) is_push = true;
}
else {
if (*value == (double)but->hardmax) is_push = 1;
if (*value == (double)but->hardmax) is_push = true;
}
break;
case COLOR:
is_push = 2;
break;
default:
is_push = 2;
is_push = -1;
break;
}
}
if (is_push == 2) {
/* pass */
}
else if (is_push == 1) {
but->flag |= UI_SELECT;
}
else {
but->flag &= ~UI_SELECT;
return is_push;
}
int ui_is_but_push(uiBut *but)
{
double value = UI_BUT_VALUE_UNSET;
return ui_is_but_push_ex(but, &value);
}
static void ui_check_but_select(uiBut *but, double *value)
{
switch (ui_is_but_push_ex(but, value)) {
case true:
but->flag |= UI_SELECT;
break;
case false:
but->flag &= ~UI_SELECT;
break;
}
}
@@ -1620,8 +1621,7 @@ void ui_set_but_val(uiBut *but, double value)
value = *((float *)but->poin) = (float)value;
}
/* update select flag */
ui_is_but_sel(but, &value);
ui_check_but_select(but, &value);
}
int ui_get_but_string_max_length(uiBut *but)
@@ -2256,7 +2256,7 @@ void ui_check_but(uiBut *but)
double value = UI_BUT_VALUE_UNSET;
// float okwidth; // UNUSED
ui_is_but_sel(but, &value);
ui_check_but_select(but, &value);
/* only update soft range while not editing */
if (but->rnaprop && !(but->editval || but->editstr || but->editvec)) {

4
source/blender/editors/interface/interface_intern.h
View File

@@ -412,6 +412,10 @@ extern int ui_is_but_rna_valid(uiBut *but);
extern int ui_is_but_utf8(uiBut *but);
extern bool ui_is_but_interactive(uiBut *but);
extern int ui_is_but_push_ex(uiBut *but, double *value);
extern int ui_is_but_push(uiBut *but);
extern void ui_bounds_block(uiBlock *block);
extern void ui_block_translate(uiBlock *block, int x, int y);
extern void ui_block_do_align(uiBlock *block);