[Bf-blender-cvs] [b6b15f0] master: UI: expose UI_POPUP_MENU_TOP for use elsewhere.

[Campbell Barton]

Commit: b6b15f07a1307c34db63c32d706656084353fa1d
Author: Campbell Barton
Date:   Sat Oct 17 00:21:35 2015 +1100
Branches: master
https://developer.blender.org/rBb6b15f07a1307c34db63c32d706656084353fa1d

UI: expose UI_POPUP_MENU_TOP for use elsewhere.

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

M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/interface/interface_regions.c

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

diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 032efad..a858a64 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -682,6 +682,8 @@ void ui_draw_preview_item(struct uiFontStyle *fstyle, rcti *rect, const char *na
 
 #define UI_TEXT_MARGIN_X 0.4f
 #define UI_POPUP_MARGIN (UI_DPI_FAC * 12)
+/* margin at top of screen for popups */
+#define UI_POPUP_MENU_TOP (int)(8 * UI_DPI_FAC)
 
 /* interface_style.c */
 void uiStyleInit(void);
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 0b586dd..40e4da2 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -70,7 +70,6 @@
 
 #include "interface_intern.h"
 
-#define MENU_TOP			(int)(8 * UI_DPI_FAC)
 #define MENU_PADDING		(int)(0.2f * UI_UNIT_Y)
 #define MENU_BORDER			(int)(0.3f * U.widget_unit)
 
@@ -822,7 +821,7 @@ bool UI_search_item_add(uiSearchItems *items, const char *name, void *poin, int
 
 int UI_searchbox_size_y(void)
 {
-	return SEARCH_ITEMS * UI_UNIT_Y + 2 * MENU_TOP;
+	return SEARCH_ITEMS * UI_UNIT_Y + 2 * UI_POPUP_MENU_TOP;
 }
 
 int UI_searchbox_size_x(void)
@@ -898,13 +897,13 @@ static void ui_searchbox_butrect(rcti *r_rect, uiSearchboxData *data, int itemnr
 	}
 	/* list view */
 	else {
-		int buth = (BLI_rcti_size_y(&data->bbox) - 2 * MENU_TOP) / SEARCH_ITEMS;
+		int buth = (BLI_rcti_size_y(&data->bbox) - 2 * UI_POPUP_MENU_TOP) / SEARCH_ITEMS;
 		
 		*r_rect = data->bbox;
 		r_rect->xmin = data->bbox.xmin + 3.0f;
 		r_rect->xmax = data->bbox.xmax - 3.0f;
 		
-		r_rect->ymax = data->bbox.ymax - MENU_TOP - itemnr * buth;
+		r_rect->ymax = data->bbox.ymax - UI_POPUP_MENU_TOP - itemnr * buth;
 		r_rect->ymin = r_rect->ymax - buth;
 	}
 	
@@ -1630,8 +1629,8 @@ static void ui_popup_block_clip(wmWindow *window, uiBlock *block)
 	
 	if (block->rect.ymin < width)
 		block->rect.ymin = width;
-	if (block->rect.ymax > winy - MENU_TOP)
-		block->rect.ymax = winy - MENU_TOP;
+	if (block->rect.ymax > winy - UI_POPUP_MENU_TOP)
+		block->rect.ymax = winy - UI_POPUP_MENU_TOP;
 	
 	/* ensure menu items draw inside left/right boundary */
 	for (bt = block->buttons.first; bt; bt = bt->next) {
@@ -1818,7 +1817,7 @@ uiBlock *ui_popup_block_refresh(
 		ar->winrct.xmin = block->rect.xmin - margin;
 		ar->winrct.xmax = block->rect.xmax + margin;
 		ar->winrct.ymin = block->rect.ymin - margin;
-		ar->winrct.ymax = block->rect.ymax + MENU_TOP;
+		ar->winrct.ymax = block->rect.ymax + UI_POPUP_MENU_TOP;
 
 		ui_block_translate(block, -ar->winrct.xmin, -ar->winrct.ymin);
 	}