[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18439] branches/blender2.5/blender/source /blender/editors/interface: 2.5

[Ton Roosendaal]

Revision: 18439
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18439
Author:   ton
Date:     2009-01-10 15:03:00 +0100 (Sat, 10 Jan 2009)

Log Message:
-----------
2.5

Popup menus were tagged with wrong direction, so arrow keys or
scrollwheel didn't work.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c	2009-01-10 03:44:02 UTC (rev 18438)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c	2009-01-10 14:03:00 UTC (rev 18439)
@@ -3338,14 +3338,13 @@
 				if(inside || (block->flag & UI_BLOCK_LOOP)) {
 					if(event->val) {
 						but= ui_but_find_activated(ar);
-
 						if(but) {
-							if(ELEM(event->type, UPARROWKEY, WHEELUPMOUSE)) {
-								if(block->direction & UI_TOP) but= ui_but_next(but);
+							if(ELEM(event->type, DOWNARROWKEY, WHEELDOWNMOUSE)) {
+								if(block->direction & UI_DOWN) but= ui_but_next(but);
 								else but= ui_but_prev(but);
 							}
 							else {
-								if(block->direction & UI_TOP) but= ui_but_prev(but);
+								if(block->direction & UI_DOWN) but= ui_but_prev(but);
 								else but= ui_but_next(but);
 							}
 

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-01-10 03:44:02 UTC (rev 18438)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c	2009-01-10 14:03:00 UTC (rev 18439)
@@ -672,7 +672,6 @@
 		saferct= MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
 		saferct->safety= block->safety;
 		BLI_addhead(&block->saferct, saferct);
-		block->direction= UI_TOP;
 	}
 
 	/* the block and buttons were positioned in window space as in 2.4x, now
@@ -1340,6 +1339,7 @@
 	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
 	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
 	block->themecol= TH_MENU_ITEM;
+	block->direction= UI_DOWN;
 	
 	md= decompose_menu_string(info->instr);
 
@@ -1503,6 +1503,7 @@
 	block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
 	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
 	block->themecol= TH_MENU_ITEM;
+	block->direction= UI_DOWN;
 	
 	md= decompose_menu_string(info->instr);