Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove unused UI_SHIFT_FLIPPED (2.4x toolbox)

Browse Source
This commit is contained in:
Campbell Barton
2014-11-09 17:16:46 +01:00
parent 8c712eaa29
commit 6c5e2ac7e6
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/UI_interface.h
View File

@@ -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) */

6
source/blender/editors/interface/interface_regions.c
View File

@@ -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);
}
}