From 436c546d67162530c8b97a87a8bf978a9015aa31 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 25 Jun 2013 10:30:07 +0000 Subject: Use bit-shift op for all bit-flags. Btw, there is a comment stating that bits 12-15 are the same for uiBlock->flag and uiBut->flag, this is obviously no more true currently (maybe it is now bits 14-17, i.e. ALIGN flags?). --- source/blender/editors/include/UI_interface.h | 188 +++++++++++++------------- 1 file changed, 95 insertions(+), 93 deletions(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 86e51b201d9..9c9ab2972b3 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -95,84 +95,86 @@ typedef struct uiLayout uiLayout; #define UI_EMBOSST 3 /* Table */ /* uiBlock->direction */ -#define UI_DIRECTION (UI_TOP | UI_DOWN | UI_LEFT | UI_RIGHT) -#define UI_TOP 1 -#define UI_DOWN 2 -#define UI_LEFT 4 -#define UI_RIGHT 8 - -#define UI_CENTER 16 -#define UI_SHIFT_FLIPPED 32 - +#define UI_DIRECTION (UI_TOP | UI_DOWN | UI_LEFT | UI_RIGHT) +#define UI_TOP (1 << 0) +#define UI_DOWN (1 << 1) +#define UI_LEFT (1 << 2) +#define UI_RIGHT (1 << 3) +#define UI_CENTER (1 << 4) +#define UI_SHIFT_FLIPPED (1 << 5) + +#if 0 /* uiBlock->autofill (not yet used) */ -// #define UI_BLOCK_COLLUMNS 1 -// #define UI_BLOCK_ROWS 2 +#define UI_BLOCK_COLLUMNS 1 +#define UI_BLOCK_ROWS 2 +#endif /* uiBlock->flag (controls) */ -#define UI_BLOCK_LOOP 1 -#define UI_BLOCK_REDRAW 2 -#define UI_BLOCK_SEARCH_MENU 4 -#define UI_BLOCK_NUMSELECT 8 -#define UI_BLOCK_NO_WIN_CLIP 16 /* don't apply window clipping */ /* was UI_BLOCK_ENTER_OK */ -#define UI_BLOCK_CLIPBOTTOM 32 -#define UI_BLOCK_CLIPTOP 64 -#define UI_BLOCK_MOVEMOUSE_QUIT 128 -#define UI_BLOCK_KEEP_OPEN 256 -#define UI_BLOCK_POPUP 512 -#define UI_BLOCK_OUT_1 1024 -#define UI_BLOCK_NO_FLIP 2048 -#define UI_BLOCK_POPUP_MEMORY 4096 -#define UI_BLOCK_CLIP_EVENTS 8192 /* stop handling mouse events */ +#define UI_BLOCK_LOOP (1 << 0) +#define UI_BLOCK_REDRAW (1 << 1) +#define UI_BLOCK_SEARCH_MENU (1 << 2) +#define UI_BLOCK_NUMSELECT (1 << 3) +#define UI_BLOCK_NO_WIN_CLIP (1 << 4) /* don't apply window clipping */ /* was UI_BLOCK_ENTER_OK */ +#define UI_BLOCK_CLIPBOTTOM (1 << 5) +#define UI_BLOCK_CLIPTOP (1 << 6) +#define UI_BLOCK_MOVEMOUSE_QUIT (1 << 7) +#define UI_BLOCK_KEEP_OPEN (1 << 8) +#define UI_BLOCK_POPUP (1 << 9) +#define UI_BLOCK_OUT_1 (1 << 10) +#define UI_BLOCK_NO_FLIP (1 << 11) +#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! */ +/* block->flag bits 12-15 are identical to but->flag bits */ /* uiPopupBlockHandle->menuretval */ -#define UI_RETURN_CANCEL 1 /* cancel all menus cascading */ -#define UI_RETURN_OK 2 /* choice made */ -#define UI_RETURN_OUT 4 /* left the menu */ -#define UI_RETURN_OUT_PARENT 8 /* let the parent handle this event */ -#define UI_RETURN_UPDATE 16 /* update the button that opened */ -#define UI_RETURN_POPUP_OK 32 /* popup is ok to be handled */ - -/* block->flag bits 12-15 are identical to but->flag bits */ +#define UI_RETURN_CANCEL (1 << 0) /* cancel all menus cascading */ +#define UI_RETURN_OK (1 << 1) /* choice made */ +#define UI_RETURN_OUT (1 << 2) /* left the menu */ +#define UI_RETURN_OUT_PARENT (1 << 3) /* let the parent handle this event */ +#define UI_RETURN_UPDATE (1 << 4) /* update the button that opened */ +#define UI_RETURN_POPUP_OK (1 << 5) /* popup is ok to be handled */ /* panel controls */ -#define UI_PNL_SOLID 2 -#define UI_PNL_CLOSE 32 -#define UI_PNL_SCALE 512 +#define UI_PNL_SOLID (1 << 1) +#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 64 -#define UI_ICON_LEFT 128 -#define UI_ICON_SUBMENU 256 -#define UI_ICON_PREVIEW 512 +#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 1024 -#define UI_BUT_NODE_LINK 2048 -#define UI_BUT_NODE_ACTIVE 4096 -#define UI_BUT_DRAG_LOCK 8192 +#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_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 */ +#define UI_BUT_COLOR_CUBIC (1 << 31) /* cubic saturation for the color wheel */ #define UI_PANEL_WIDTH 340 #define UI_COMPACT_PANEL_WIDTH 160 @@ -279,9 +281,9 @@ void uiDrawBoxShade(int mode, float minx, float miny, float maxx, float maxy, fl void uiDrawBoxVerticalShade(int mode, float minx, float miny, float maxx, float maxy, float rad, float shadeLeft, float shadeRight); /* state for scrolldrawing */ -#define UI_SCROLL_PRESSED 1 -#define UI_SCROLL_ARROWS 2 -#define UI_SCROLL_NO_OUTLINE 4 +#define UI_SCROLL_PRESSED (1 << 0) +#define UI_SCROLL_ARROWS (1 << 1) +#define UI_SCROLL_NO_OUTLINE (1 << 2) void uiWidgetScrollDraw(struct uiWidgetColors *wcol, const struct rcti *rect, const struct rcti *slider, int state); /* Callbacks @@ -556,18 +558,18 @@ void uiButGetStrInfo(struct bContext *C, uiBut *but, ...); * - PickerButtons: buttons like the color picker (for code sharing). * - AutoButR: RNA property button with type automatically defined. */ -#define UI_ID_RENAME 1 -#define UI_ID_BROWSE 2 -#define UI_ID_ADD_NEW 4 -#define UI_ID_OPEN 8 -#define UI_ID_ALONE 16 -#define UI_ID_DELETE 32 -#define UI_ID_LOCAL 64 -#define UI_ID_AUTO_NAME 128 -#define UI_ID_FAKE_USER 256 -#define UI_ID_PIN 512 -#define UI_ID_BROWSE_RENDER 1024 -#define UI_ID_PREVIEWS 2048 +#define UI_ID_RENAME (1 << 0) +#define UI_ID_BROWSE (1 << 1) +#define UI_ID_ADD_NEW (1 << 2) +#define UI_ID_OPEN (1 << 3) +#define UI_ID_ALONE (1 << 4) +#define UI_ID_DELETE (1 << 5) +#define UI_ID_LOCAL (1 << 6) +#define UI_ID_AUTO_NAME (1 << 7) +#define UI_ID_FAKE_USER (1 << 8) +#define UI_ID_PIN (1 << 9) +#define UI_ID_BROWSE_RENDER (1 << 10) +#define UI_ID_PREVIEWS (1 << 11) #define UI_ID_FULL (UI_ID_RENAME | UI_ID_BROWSE | UI_ID_ADD_NEW | UI_ID_OPEN | UI_ID_ALONE | UI_ID_DELETE | UI_ID_LOCAL) int uiIconFromID(struct ID *id); @@ -708,15 +710,15 @@ void UI_exit(void); #define UI_LAYOUT_ALIGN_CENTER 2 #define UI_LAYOUT_ALIGN_RIGHT 3 -#define UI_ITEM_O_RETURN_PROPS 1 -#define UI_ITEM_R_EXPAND 2 -#define UI_ITEM_R_SLIDER 4 -#define UI_ITEM_R_TOGGLE 8 -#define UI_ITEM_R_ICON_ONLY 16 -#define UI_ITEM_R_EVENT 32 -#define UI_ITEM_R_FULL_EVENT 64 -#define UI_ITEM_R_NO_BG 128 -#define UI_ITEM_R_IMMEDIATE 256 +#define UI_ITEM_O_RETURN_PROPS (1 << 0) +#define UI_ITEM_R_EXPAND (1 << 1) +#define UI_ITEM_R_SLIDER (1 << 2) +#define UI_ITEM_R_TOGGLE (1 << 3) +#define UI_ITEM_R_ICON_ONLY (1 << 4) +#define UI_ITEM_R_EVENT (1 << 5) +#define UI_ITEM_R_FULL_EVENT (1 << 6) +#define UI_ITEM_R_NO_BG (1 << 7) +#define UI_ITEM_R_IMMEDIATE (1 << 8) /* uiLayoutOperatorButs flags */ #define UI_LAYOUT_OP_SHOW_TITLE 1 @@ -729,13 +731,13 @@ void UI_exit(void); * 8------4 */ enum { - UI_CNR_TOP_LEFT = 1, - UI_CNR_TOP_RIGHT = 2, - UI_CNR_BOTTOM_RIGHT = 4, - UI_CNR_BOTTOM_LEFT = 8, + UI_CNR_TOP_LEFT = (1 << 0), + UI_CNR_TOP_RIGHT = (1 << 1), + UI_CNR_BOTTOM_RIGHT = (1 << 2), + UI_CNR_BOTTOM_LEFT = (1 << 3), /* just for convenience */ - UI_CNR_NONE = 0, - UI_CNR_ALL = (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT) + UI_CNR_NONE = 0, + UI_CNR_ALL = (UI_CNR_TOP_LEFT | UI_CNR_TOP_RIGHT | UI_CNR_BOTTOM_RIGHT | UI_CNR_BOTTOM_LEFT) }; /* not apart of the corner flags but mixed in some functions */ -- cgit v1.2.3