diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-09 19:16:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-09 19:17:46 +0300 |
commit | 6c5e2ac7e666e6fac5b831a16c337eabbd88f4f6 (patch) | |
tree | 58fde302ab289c96ae3bd9b86997dfd75423e229 /source/blender | |
parent | 8c712eaa297162669fc0be849da115dd8db400d5 (diff) |
Cleanup: remove unused UI_SHIFT_FLIPPED (2.4x toolbox)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 3704315bb61..e8cca243a93 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -111,7 +111,6 @@ typedef struct uiLayout uiLayout; #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) */ diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 097dbe9e23a..d863845f3ad 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1377,7 +1377,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, /* aspect /= (float)xsize;*/ /*UNUSED*/ { - int left = 0, right = 0, top = 0, down = 0; + bool left = 0, right = 0, top = 0, down = 0; int winx, winy; // int offscreen; @@ -1444,8 +1444,6 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, else xof = butrct.xmin - block->rect.xmin; /* changed direction? */ if ((dir1 & block->direction) == 0) { - if (block->direction & UI_SHIFT_FLIPPED) - xof += dir2 == UI_LEFT ? 25 : -25; uiBlockFlipOrder(block); } } @@ -1455,8 +1453,6 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, else xof = butrct.xmin - block->rect.xmin; /* changed direction? */ if ((dir1 & block->direction) == 0) { - if (block->direction & UI_SHIFT_FLIPPED) - xof += dir2 == UI_LEFT ? 25 : -25; uiBlockFlipOrder(block); } } |