diff options
author | Julian Eisel <julian@blender.org> | 2020-08-07 16:02:07 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-08-07 16:17:52 +0300 |
commit | 68c00e6f8f2612d76f95fb7744cb9cfbfcfacdf8 (patch) | |
tree | 8785ad94ffea2c266ce662b1fcf3f14a9f9fdc3f /source/blender/editors/interface/interface_intern.h | |
parent | 49f088e2d0936ed3b5f08881a14ad83c19951791 (diff) |
UI Code Quality: Use derived struct for color buttons
For the main rationale behind this design, see 03b122e2a18df. Further,
this removes users of `uiBut.a1`/`uiBut.a2`, which is a very ugly design
choice (hard to reason about).
Part of Part of T74432.
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 0dfa23a4332..9840444c0e0 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -177,7 +177,6 @@ struct uiBut { * - UI_BTYPE_LABEL: Use `(a1 == 1.0f)` to use a2 as a blending factor (imaginative!). * - UI_BTYPE_SCROLL: Use as scroll size. * - UI_BTYPE_SEARCH_MENU: Use as number or rows. - * - UI_BTYPE_COLOR: Use as indication of color palette. * - UI_BTYPE_PROGRESS_BAR: Use to store progress (0..1). */ float a1; @@ -188,7 +187,6 @@ struct uiBut { * - UI_BTYPE_NUM: Use to store RNA 'precision' value, for dragging and click-step. * - UI_BTYPE_LABEL: If `(a1 == 1.0f)` use a2 as a blending factor. * - UI_BTYPE_SEARCH_MENU: Use as number or columns. - * - UI_BTYPE_COLOR: Use as index in palette (not so good, needs refactor). */ float a2; @@ -281,6 +279,14 @@ struct uiBut { uiBlock *block; }; +/** Derived struct for #UI_BTYPE_COLOR */ +typedef struct uiButColor { + uiBut but; + + bool is_pallete_color; + int palette_color_index; +} uiButColor; + /** Derived struct for #UI_BTYPE_TAB */ typedef struct uiButTab { uiBut but; |