[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17895] branches/blender2.5/blender/source /blender:

[Brecht Van Lommel]

Revision: 17895
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17895
Author:   blendix
Date:     2008-12-16 18:36:51 +0100 (Tue, 16 Dec 2008)

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

UI:
* Only open tooltip when the mouse is still over the button.
* Remove an unnecessary redraw call, though the two mentioned
  in the previous commit seem to be working OK (it's for action
  buttons when you move the mouse away from the button, holding
  the mouse button down).
* Fix missing alt key in key event strings.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c	2008-12-16 16:32:48 UTC (rev 17894)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c	2008-12-16 17:36:51 UTC (rev 17895)
@@ -2708,15 +2708,19 @@
 		BUTTON_STATE_TEXT_SELECTING, BUTTON_STATE_MENU_OPEN);
 }
 
-static void button_tooltip_timer_start(uiBut *but)
+static void button_tooltip_timer_reset(uiBut *but)
 {
 	uiHandleButtonData *data;
 
 	data= but->active;
 
-	/* XXX 2.50 U missing from context */
+	if(data->tooltiptimer) {
+		WM_event_remove_window_timer(data->window, data->tooltiptimer);
+		data->tooltiptimer= NULL;
+	}
+
 	if(U.flag & USER_TOOLTIPS)
-		if(!data->tooltiptimer && !but->block->tooltipdisabled)
+		if(!but->block->tooltipdisabled)
 			data->tooltiptimer= WM_event_add_window_timer(data->window, BUTTON_TOOLTIP_DELAY, ~0);
 }
 
@@ -2732,7 +2736,7 @@
 	if(state == BUTTON_STATE_HIGHLIGHT) {
 		but->flag &= ~UI_SELECT;
 
-		button_tooltip_timer_start(but);
+		button_tooltip_timer_reset(but);
 
 		/* automatic open pulldown block timer */
 		if(but->type==BLOCK || but->type==MENU || but->type==PULLDOWN || but->type==ICONTEXTROW) {
@@ -2766,7 +2770,6 @@
 			data->autoopentimer= NULL;
 		}
 	}
-	ED_region_tag_redraw(data->region);
 
 	/* text editing */
 	if(state == BUTTON_STATE_TEXT_EDITING && data->state != BUTTON_STATE_TEXT_SELECTING)
@@ -2809,6 +2812,9 @@
 	}
 
 	data->state= state;
+
+	/* redraw */
+	ED_region_tag_redraw(data->region);
 }
 
 static void button_activate_init(bContext *C, ARegion *ar, uiBut *but, uiButtonActivateType type)
@@ -2966,7 +2972,7 @@
 				else if(event->x!=event->prevx || event->y!=event->prevy) {
 					/* re-enable tooltip on mouse move */
 					ui_blocks_set_tooltips(ar, 1);
-					button_tooltip_timer_start(but);
+					button_tooltip_timer_reset(but);
 				}
 
 				break;
@@ -2976,10 +2982,8 @@
 					WM_event_remove_window_timer(data->window, data->tooltiptimer);
 					data->tooltiptimer= NULL;
 
-					if(!data->tooltip) {
+					if(!data->tooltip)
 						data->tooltip= ui_tooltip_create(C, data->region, but);
-						ED_region_tag_redraw(data->region);
-					}
 				}
 				/* handle menu auto open timer */
 				else if(event->customdata == data->autoopentimer) {

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c	2008-12-16 16:32:48 UTC (rev 17894)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c	2008-12-16 17:36:51 UTC (rev 17895)
@@ -495,6 +495,9 @@
 	if(kmi->ctrl)
 		strcat(buf, "Ctrl ");
 
+	if(kmi->alt)
+		strcat(buf, "Alt ");
+
 	if(kmi->oskey)
 		strcat(buf, "OS ");