[Bf-blender-cvs] [254aa8f] master: Squashed commit of the following:

Bastien Montagne noreply at git.blender.org
Thu Nov 21 14:42:52 CET 2013


Commit: 254aa8f3a0fbffcbcb886cfaa81b630ae3e9bb78
Author: Bastien Montagne
Date:   Thu Nov 21 14:43:08 2013 +0100
http://developer.blender.org/rB254aa8f3a0fbffcbcb886cfaa81b630ae3e9bb78

Squashed commit of the following:

commit 6f97e194e58aab38d351c796bf7bb6abca33f5f9
Author: Bastien Montagne <montagne29 at wanadoo.fr>
Date:   Wed Nov 20 21:18:20 2013 +0100

    Code cleanup: Move some uiBut->flag to uiBut->drawflag, make those flags anonymous enums.

    Summary:
    Make some room in but->flag (I did not add another flag, we already have drawflag, which was nearly not used up till now).

    Note: I’m not sure whether REDALERT (and perhaps even DISABLED?) should not go to but->drawflag as well...

    Related to D8

    Reviewers: brecht

    Differential Revision: http://developer.blender.org/D22

===================================================================

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface.c
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_layout.c
M	source/blender/editors/interface/interface_regions.c
M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/interface/interface_widgets.c
M	source/blender/editors/space_buttons/buttons_texture.c
M	source/blender/editors/space_file/file_panels.c
M	source/blender/editors/space_node/node_templates.c
M	source/blender/editors/space_view3d/view3d_buttons.c

===================================================================

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 50e2e53..53bfc94 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -93,7 +93,7 @@ typedef struct uiLayout uiLayout;
 /* use for clamping popups within the screen */
 #define UI_SCREEN_MARGIN 10
 
-/* uiBlock->dt */
+/* uiBlock->dt and uiBut->dt */
 #define UI_EMBOSS       0   /* use widget style for drawing */
 #define UI_EMBOSSN      1   /* Nothing, only icon and/or text */
 #define UI_EMBOSSP      2   /* Pulldown menu style */
@@ -130,8 +130,7 @@ typedef struct uiLayout uiLayout;
 #define UI_BLOCK_POPUP_MEMORY   (1 << 12)
 #define UI_BLOCK_CLIP_EVENTS    (1 << 13)  /* stop handling mouse events */
 
-/* XXX This comment is no more valid! Maybe it is now bits 14-17? */
-/* block->flag bits 12-15 are identical to but->flag bits */
+/* block->flag bits 14-17 are identical to but->drawflag bits */
 
 #define UI_BLOCK_LIST_ITEM   (1 << 19)
 
@@ -148,46 +147,51 @@ typedef struct uiLayout uiLayout;
 #define UI_PNL_CLOSE    (1 << 5)
 #define UI_PNL_SCALE    (1 << 9)
 
-/* warning the first 6 flags are internal */
-/* but->flag */
-#define UI_TEXT_LEFT         (1 << 6)
-#define UI_ICON_LEFT         (1 << 7)
-#define UI_ICON_SUBMENU      (1 << 8)
-#define UI_ICON_PREVIEW      (1 << 9)
-
-#define UI_TEXT_RIGHT        (1 << 10)
-#define UI_BUT_NODE_LINK     (1 << 11)
-#define UI_BUT_NODE_ACTIVE   (1 << 12)
-#define UI_BUT_DRAG_LOCK     (1 << 13)
-
-/* button align flag, for drawing groups together */
-#define UI_BUT_ALIGN         (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT | UI_BUT_ALIGN_DOWN)
-#define UI_BUT_ALIGN_TOP     (1 << 14)
-#define UI_BUT_ALIGN_LEFT    (1 << 15)
-#define UI_BUT_ALIGN_RIGHT   (1 << 16)
-#define UI_BUT_ALIGN_DOWN    (1 << 17)
-
-#define UI_BUT_DISABLED      (1 << 18)
-#define UI_BUT_COLOR_LOCK    (1 << 19)
-#define UI_BUT_ANIMATED      (1 << 20)
-#define UI_BUT_ANIMATED_KEY  (1 << 21)
-#define UI_BUT_DRIVEN        (1 << 22)
-#define UI_BUT_REDALERT      (1 << 23)
-#define UI_BUT_INACTIVE      (1 << 24)
-#define UI_BUT_LAST_ACTIVE   (1 << 25)
-#define UI_BUT_UNDO          (1 << 26)
-#define UI_BUT_IMMEDIATE     (1 << 27)
-#define UI_BUT_NO_TOOLTIP    (1 << 28)
-#define UI_BUT_NO_UTF8       (1 << 29)
-
-#define UI_BUT_VEC_SIZE_LOCK (1 << 30) /* used to flag if color hsv-circle should keep luminance */
-#define UI_BUT_COLOR_CUBIC   (1 << 31) /* cubic saturation for the color wheel */
+/* but->flag - general state flags. */
+enum {
+	/* warning, the first 6 flags are internal */
+	UI_ICON_SUBMENU      = (1 << 6),
+	UI_ICON_PREVIEW      = (1 << 7),
+
+	UI_BUT_NODE_LINK     = (1 << 8),
+	UI_BUT_NODE_ACTIVE   = (1 << 9),
+	UI_BUT_DRAG_LOCK     = (1 << 10),
+	UI_BUT_DISABLED      = (1 << 11),
+	UI_BUT_COLOR_LOCK    = (1 << 12),
+	UI_BUT_ANIMATED      = (1 << 13),
+	UI_BUT_ANIMATED_KEY  = (1 << 14),
+	UI_BUT_DRIVEN        = (1 << 15),
+	UI_BUT_REDALERT      = (1 << 16),
+	UI_BUT_INACTIVE      = (1 << 17),
+	UI_BUT_LAST_ACTIVE   = (1 << 18),
+	UI_BUT_UNDO          = (1 << 19),
+	UI_BUT_IMMEDIATE     = (1 << 20),
+	UI_BUT_NO_UTF8       = (1 << 21),
+
+	UI_BUT_VEC_SIZE_LOCK = (1 << 22),  /* used to flag if color hsv-circle should keep luminance */
+	UI_BUT_COLOR_CUBIC   = (1 << 23),  /* cubic saturation for the color wheel */
+};
 
 #define UI_PANEL_WIDTH          340
 #define UI_COMPACT_PANEL_WIDTH  160
 
-/* uiBut->drawflag */
-#define UI_BUT_DRAW_ENUM_ARROWS    (1 << 0) /* draw enum-like up/down arrows for button */
+/* but->drawflag - these flags should only affect how the button is drawn. */
+enum {
+	/* draw enum-like up/down arrows for button */
+	UI_BUT_DRAW_ENUM_ARROWS  = (1 << 0),
+	/* Text and icon alignment (by default, they are centered). */
+	UI_BUT_TEXT_LEFT         = (1 << 1),
+	UI_BUT_ICON_LEFT         = (1 << 2),
+	UI_BUT_TEXT_RIGHT        = (1 << 3),
+	/* Prevent the button to show any tooltip. */
+	UI_BUT_NO_TOOLTIP        = (1 << 4),
+	/* button align flag, for drawing groups together (also used in uiBlock->flag!) */
+	UI_BUT_ALIGN_TOP         = (1 << 14),
+	UI_BUT_ALIGN_LEFT        = (1 << 15),
+	UI_BUT_ALIGN_RIGHT       = (1 << 16),
+	UI_BUT_ALIGN_DOWN        = (1 << 17),
+	UI_BUT_ALIGN             = (UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_LEFT | UI_BUT_ALIGN_RIGHT | UI_BUT_ALIGN_DOWN),
+};
 
 /* scale fixed button widths by this to account for DPI */
 
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 83b100d..800fee6 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2604,7 +2604,7 @@ static void ui_block_do_align_but(uiBut *first, short nr)
 			next = NULL;
 
 		/* clear old flag */
-		but->flag &= ~UI_BUT_ALIGN;
+		but->drawflag &= ~UI_BUT_ALIGN;
 			
 		if (flag == 0) {  /* first case */
 			if (next) {
@@ -2683,7 +2683,7 @@ static void ui_block_do_align_but(uiBut *first, short nr)
 			}
 		}
 		
-		but->flag |= flag;
+		but->drawflag |= flag;
 		
 		/* merge coordinates */
 		if (prev) {
@@ -2863,10 +2863,10 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
 	if ((block->flag & UI_BLOCK_LOOP) ||
 	    ELEM8(but->type, MENU, TEX, LABEL, BLOCK, BUTM, SEARCH_MENU, PROGRESSBAR, SEARCH_MENU_UNLINK))
 	{
-		but->flag |= (UI_TEXT_LEFT | UI_ICON_LEFT);
+		but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT);
 	}
 
-	but->flag |= (block->flag & UI_BUT_ALIGN);
+	but->drawflag |= (block->flag & UI_BUT_ALIGN);
 
 	if (but->lock == TRUE) {
 		if (but->lockstr) {
@@ -3041,7 +3041,7 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s
 	if (icon) {
 		but->icon = (BIFIconID)icon;
 		but->flag |= UI_HAS_ICON;
-		but->flag |= UI_ICON_LEFT;
+		but->drawflag |= UI_BUT_ICON_LEFT;
 	}
 	
 	if (!RNA_property_editable(&but->rnapoin, prop)) {
@@ -3430,7 +3430,7 @@ uiBut *uiDefIconTextBut(uiBlock *block, int type, int retval, int icon, const ch
 {
 	uiBut *but = ui_def_but(block, type, retval, str, x, y, width, height, poin, min, max, a1, a2, tip);
 	ui_check_but_and_iconize(but, icon);
-	but->flag |= UI_ICON_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT;
 	return but;
 }
 static uiBut *uiDefIconTextButBit(uiBlock *block, int type, int bit, int retval, int icon, const char *str, int x, int y, short width, short height, void *poin, float min, float max, float a1, float a2,  const char *tip)
@@ -3481,7 +3481,7 @@ uiBut *uiDefIconTextButR(uiBlock *block, int type, int retval, int icon, const c
 	uiBut *but;
 	but = ui_def_but_rna_propname(block, type, retval, str, x, y, width, height, ptr, propname, index, min, max, a1, a2, tip);
 	ui_check_but_and_iconize(but, icon);
-	but->flag |= UI_ICON_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT;
 	return but;
 }
 uiBut *uiDefIconTextButR_prop(uiBlock *block, int type, int retval, int icon, const char *str, int x, int y, short width, short height, PointerRNA *ptr, PropertyRNA *prop, int index, float min, float max, float a1, float a2,  const char *tip)
@@ -3489,7 +3489,7 @@ uiBut *uiDefIconTextButR_prop(uiBlock *block, int type, int retval, int icon, co
 	uiBut *but;
 	but = ui_def_but_rna(block, type, retval, str, x, y, width, height, ptr, prop, index, min, max, a1, a2, tip);
 	ui_check_but_and_iconize(but, icon);
-	but->flag |= UI_ICON_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT;
 	return but;
 }
 uiBut *uiDefIconTextButO_ptr(uiBlock *block, int type, wmOperatorType *ot, int opcontext, int icon, const char *str, int x, int y, short width, short height, const char *tip)
@@ -3497,7 +3497,7 @@ uiBut *uiDefIconTextButO_ptr(uiBlock *block, int type, wmOperatorType *ot, int o
 	uiBut *but;
 	but = ui_def_but_operator_ptr(block, type, ot, opcontext, str, x, y, width, height, tip);
 	ui_check_but_and_iconize(but, icon);
-	but->flag |= UI_ICON_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT;
 	return but;
 }
 uiBut *uiDefIconTextButO(uiBlock *block, int type, const char *opname, int opcontext, int icon, const char *str, int x, int y, short width, short height, const char *tip)
@@ -3553,7 +3553,7 @@ void uiBlockFlipOrder(uiBlock *block)
 		return;
 	
 	for (but = block->buttons.first; but; but = but->next) {
-		if (but->flag & UI_BUT_ALIGN) return;
+		if (but->drawflag & UI_BUT_ALIGN) return;
 		if (but->rect.ymin < miny) miny = but->rect.ymin;
 		if (but->rect.ymax > maxy) maxy = but->rect.ymax;
 	}
@@ -3794,7 +3794,7 @@ uiBut *uiDefIconTextMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, in
 	but->icon = (BIFIconID) icon;
 	but->flag |= UI_HAS_ICON;
 
-	but->flag |= UI_ICON_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT;
 	but->flag |= UI_ICON_SUBMENU;
 
 	but->menu_create_func = func;
@@ -3809,7 +3809,7 @@ uiBut *uiDefIconMenuBut(uiBlock *block, uiMenuCreateFunc func, void *arg, int ic
 
 	but->icon = (BIFIconID) icon;
 	but->flag |= UI_HAS_ICON;
-	but->flag &= ~UI_ICON_LEFT;
+	but->drawflag &= ~UI_BUT_ICON_LEFT;
 
 	but->menu_create_func = func;
 	ui_check_but(but);
@@ -3825,7 +3825,7 @@ uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg,
 	/* XXX temp, old menu calls pass on icon arrow, which is now UI_ICON_SUBMENU flag */
 	if (icon != ICON_RIGHTARROW_THIN) {
 		but->icon = (BIFIconID) icon;
-		but->flag |= UI_ICON_LEFT;
+		but->drawflag |= UI_BUT_ICON_LEFT;
 	}
 	but->flag |= UI_HAS_ICON;
 	but->flag |= UI_ICON_SUBMENU;
@@ -3844,7 +3844,7 @@ uiBut *uiDefIconBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, int
 	but->icon = (BIFIconID) icon;
 	but->flag |= UI_HAS_ICON;
 	
-	but->flag |= UI_ICON_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT;
 	
 	but->block_create_func = func;
 	ui_check_but(but);
@@ -3879,7 +3879,7 @@ uiBut *uiDefSearchBut(uiBlock *block, void *arg, int retval, int icon, int maxle
 	but->icon = (BIFIconID) icon;
 	but->flag |= UI_HAS_ICON;
 	
-	but->flag |= UI_ICON_LEFT | UI_TEXT_LEFT;
+	but->drawflag |= UI_BUT_ICON_LEFT | UI_BUT_TEXT_LEFT;
 	
 	ui_check_but(but);
 	
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 2b8b764..33a0543 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list