[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50092] branches/soc-2011-tomato: svn merge ^/trunk/blender -r50089:50091

[Campbell Barton]

Revision: 50092
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50092
Author:   campbellbarton
Date:     2012-08-21 15:45:58 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50089:50091

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50089

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50089
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50091


Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50089
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50091

Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c	2012-08-21 15:45:17 UTC (rev 50091)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c	2012-08-21 15:45:58 UTC (rev 50092)
@@ -2945,9 +2945,11 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		else if (ELEM3(but->type, MENU, ICONROW, ICONTEXTROW)) {
-			
-			if (event->type == WHEELDOWNMOUSE && event->alt) {
-				data->value = ui_step_name_menu(but, -1);
+			if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->alt) {
+				const int direction = (event->type == WHEELDOWNMOUSE) ? -1 : 1;
+
+				data->value = ui_step_name_menu(but, direction);
+
 				button_activate_state(C, but, BUTTON_STATE_EXIT);
 				ui_apply_button(C, but->block, but, data, 1);
 
@@ -2961,17 +2963,16 @@
 				data->postbut = but;
 				data->posttype = BUTTON_ACTIVATE_OVER;
 
-				return WM_UI_HANDLER_BREAK;
-			}
-			else if (event->type == WHEELUPMOUSE && event->alt) {
-				data->value = ui_step_name_menu(but, 1);
-				button_activate_state(C, but, BUTTON_STATE_EXIT);
-				ui_apply_button(C, but->block, but, data, 1);
+				/* without this, a new interface that draws as result of the menu change
+				 * won't register that the mouse is over it, eg:
+				 * Alt+MouseWheel over the render slots, without this,
+				 * the slot menu fails to switch a second time.
+				 *
+				 * Theactive state of the button could be maintained some other way
+				 * and remove this mousemove event.
+				 */
+				WM_event_add_mousemove(C);
 
-				/* why this is needed described above */
-				data->postbut = but;
-				data->posttype = BUTTON_ACTIVATE_OVER;
-
 				return WM_UI_HANDLER_BREAK;
 			}
 		}


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50089
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50091