[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53328] trunk/blender/source/blender/ editors/interface/interface_regions.c: Bug fix #33633 (and irc report)

[Ton Roosendaal]

Revision: 53328
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53328
Author:   ton
Date:     2012-12-26 13:57:07 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
Bug fix #33633 (and irc report)

The function ui_popup_block_clip() didn't correct the buttons if a clip
happened, causing the items to draw outside.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_regions.c

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2012-12-26 13:25:13 UTC (rev 53327)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2012-12-26 13:57:07 UTC (rev 53328)
@@ -1527,6 +1527,7 @@
 
 static void ui_popup_block_clip(wmWindow *window, uiBlock *block)
 {
+	uiBut *bt;
 	int width = UI_ThemeMenuShadowWidth();
 	int winx, winy;
 
@@ -1536,7 +1537,6 @@
 
 	winx = WM_window_pixels_x(window);
 	winy = WM_window_pixels_y(window);
-	// wm_window_get_size(window, &winx, &winy);
 	
 	if (block->rect.xmin < width)
 		block->rect.xmin = width;
@@ -1547,6 +1547,15 @@
 		block->rect.ymin = width;
 	if (block->rect.ymax > winy - MENU_TOP)
 		block->rect.ymax = winy - MENU_TOP;
+	
+	/* ensure menu items draw inside left/right boundary */
+	for (bt = block->buttons.first; bt; bt = bt->next) {
+		if (bt->rect.xmin < block->rect.xmin)
+			bt->rect.xmin = block->rect.xmin;
+		if (bt->rect.xmax > block->rect.xmax)
+			bt->rect.xmax = block->rect.xmax;
+	}
+
 }
 
 void ui_popup_block_scrolltest(uiBlock *block)