[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53612] trunk/blender/source/blender/ editors: Three fixes:

[Ton Roosendaal]

Revision: 53612
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53612
Author:   ton
Date:     2013-01-06 18:28:39 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Three fixes:

- Old issue: on scrolling button views, tooltips could open or stayed open.

- New fix: alt+swipe now changes button values again

- Removed test print, from WIP code project.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-01-06 18:26:29 UTC (rev 53611)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-01-06 18:28:39 UTC (rev 53612)
@@ -238,6 +238,7 @@
 				*type = WHEELUPMOUSE;
 			else
 				*type = WHEELDOWNMOUSE;
+			
 			lastdy = 0;
 		}
 	}
@@ -2717,7 +2718,9 @@
 		ui_pan_to_scroll(event, &type, &val);
 		
 		/* XXX hardcoded keymap check.... */
-		if (type == WHEELDOWNMOUSE && event->alt) {
+		if (type == MOUSEPAN && event->alt)
+			retval = WM_UI_HANDLER_BREAK; /* allow accumulating values, otherwise scrolling gets preference */
+		else if (type == WHEELDOWNMOUSE && event->alt) {
 			mx = but->rect.xmin;
 			click = 1;
 		}
@@ -2945,7 +2948,9 @@
 		ui_pan_to_scroll(event, &type, &val);
 
 		/* XXX hardcoded keymap check.... */
-		if (type == WHEELDOWNMOUSE && event->alt) {
+		if (type == MOUSEPAN && event->alt)
+			retval = WM_UI_HANDLER_BREAK; /* allow accumulating values, otherwise scrolling gets preference */
+		else if (type == WHEELDOWNMOUSE && event->alt) {
 			mx = but->rect.xmin;
 			click = 2;
 		}
@@ -6010,19 +6015,18 @@
 
 				retval = WM_UI_HANDLER_CONTINUE;
 				break;
-				case WHEELUPMOUSE:
-				case WHEELDOWNMOUSE:
-				case MIDDLEMOUSE:
-					/* XXX hardcoded keymap check... but anyway, while view changes, tooltips should be removed */
-					if (data->tooltiptimer) {
-						WM_event_remove_timer(data->wm, data->window, data->tooltiptimer);
-						data->tooltiptimer = NULL;
-					}
-				/* pass on purposedly */
-				default:
-					/* handle button type specific events */
-					retval = ui_do_button(C, block, but, event);
 			}
+				/* XXX hardcoded keymap check... but anyway, while view changes, tooltips should be removed */
+			case WHEELUPMOUSE:
+			case WHEELDOWNMOUSE:
+			case MIDDLEMOUSE:
+			case MOUSEPAN:
+				button_timers_tooltip_remove(C, but);
+
+			/* pass on purposedly */
+			default:
+				/* handle button type specific events */
+				retval = ui_do_button(C, block, but, event);
 		}
 	}
 	else if (data->state == BUTTON_STATE_WAIT_RELEASE) {

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2013-01-06 18:26:29 UTC (rev 53611)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2013-01-06 18:28:39 UTC (rev 53612)
@@ -886,8 +886,6 @@
 	ShaderPreview *sp = customdata;
 	ID *id = sp->id;
 	short idtype = GS(id->name);
-
-	printf("icon start job %s\n", id->name);
 	
 	if (idtype == ID_IM) {
 		Image *ima = (Image *)id;
@@ -1012,7 +1010,6 @@
 	IconPreview *ip = customdata;
 
 	if (ip->id) {
-		printf("icon end job %s\n", ip->id->name);
 
 		if (GS(ip->id->name) == ID_BR)
 			WM_main_add_notifier(NC_BRUSH | NA_EDITED, ip->id);