diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-12 23:18:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-12 23:31:06 +0400 |
| commit | 032b42d48de111d48c85a09118966691997d0374 (patch) | |
| tree | a02784463a5094dd5383b1e0c89f0390823b6464 /source/blender/editors/interface | |
| parent | deef641878721438f39504aeef77c814500f37bb (diff) | |
Code cleanup: de-duplicate switch statement, style edits
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 23 |
3 files changed, 15 insertions, 18 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 744d19dd6e1..b8e00022a61 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1096,7 +1096,7 @@ void uiEndBlock(const bContext *C, uiBlock *block) block->auto_open_last = block->oldblock->auto_open_last; block->tooltipdisabled = block->oldblock->tooltipdisabled; copy_v3_v3(ui_block_hsv_get(block), - ui_block_hsv_get(block->oldblock)); + ui_block_hsv_get(block->oldblock)); block->oldblock = NULL; } diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 0e966aaaa7d..eeb41c8909f 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1897,10 +1897,6 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper RNA_property_float_get_array(ptr, prop, rgba); switch (U.color_picker_type) { - case USER_CP_CIRCLE_HSV: - case USER_CP_CIRCLE_HSL: - circle_picker(block, ptr, prop); - break; case USER_CP_SQUARE_SV: square_picker(block, ptr, prop, UI_GRAD_SV); break; @@ -1910,6 +1906,10 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper case USER_CP_SQUARE_HV: square_picker(block, ptr, prop, UI_GRAD_HV); break; + + /* user default */ + case USER_CP_CIRCLE_HSV: + case USER_CP_CIRCLE_HSL: default: circle_picker(block, ptr, prop); break; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index a7be32ab88b..a4937514a9d 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2240,11 +2240,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna row = uiLayoutRow(col, true); switch (U.color_picker_type) { - case USER_CP_CIRCLE_HSV: - case USER_CP_CIRCLE_HSL: - but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop, - -1, 0.0, 0.0, 0, 0, ""); - break; case USER_CP_SQUARE_SV: but = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop, -1, 0.0, 0.0, UI_GRAD_SV, 0, ""); @@ -2257,9 +2252,13 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna but = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop, -1, 0.0, 0.0, UI_GRAD_HV, 0, ""); break; + + /* user default */ + case USER_CP_CIRCLE_HSV: + case USER_CP_CIRCLE_HSL: default: but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop, - -1, 0.0, 0.0, 0, 0, ""); + -1, 0.0, 0.0, 0, 0, ""); break; } @@ -2281,15 +2280,10 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna if (value_slider) { switch (U.color_picker_type) { - case USER_CP_CIRCLE_HSV: - uiItemS(row); - uiDefButR_prop(block, HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop, - -1, softmin, softmax, UI_GRAD_V_ALT, 0, ""); - break; case USER_CP_CIRCLE_HSL: uiItemS(row); uiDefButR_prop(block, HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop, - -1, softmin, softmax, UI_GRAD_L_ALT, 0, ""); + -1, softmin, softmax, UI_GRAD_L_ALT, 0, ""); break; case USER_CP_SQUARE_SV: uiItemS(col); @@ -2306,10 +2300,13 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna uiDefButR_prop(block, HSVCUBE, 0, "", 0, 4, WHEEL_SIZE, 18, ptr, prop, -1, softmin, softmax, UI_GRAD_HV + 3, 0, ""); break; + + /* user default */ + case USER_CP_CIRCLE_HSV: default: uiItemS(row); uiDefButR_prop(block, HSVCUBE, 0, "", WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop, - -1, softmin, softmax, UI_GRAD_V_ALT, 0, ""); + -1, softmin, softmax, UI_GRAD_V_ALT, 0, ""); break; } } |