[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47235] branches/soc-2012-bratwurst/source /blender: Revert tooltips so I can do it the right way

Jorge Rodriguez bs.vino at gmail.com
Wed May 30 18:37:13 CEST 2012


Revision: 47235
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47235
Author:   vino
Date:     2012-05-30 16:37:12 +0000 (Wed, 30 May 2012)
Log Message:
-----------
Revert tooltips so I can do it the right way

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
    branches/soc-2012-bratwurst/source/blender/makesdna/DNA_windowmanager_types.h

Modified: branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-05-30 16:22:33 UTC (rev 47234)
+++ branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-05-30 16:37:12 UTC (rev 47235)
@@ -83,7 +83,6 @@
 
 /***************** structs and defines ****************/
 
-#define BUTTON_TOOLTIP_RESET        0.200
 #define BUTTON_TOOLTIP_DELAY        0.500
 #define BUTTON_FLASH_DELAY          0.020
 #define MENU_SCROLL_INTERVAL        0.1
@@ -5087,16 +5086,10 @@
 		data->tooltiptimer = NULL;
 	}
 
-	if (U.flag & USER_TOOLTIPS) {
-		if (!but->block->tooltipdisabled) {
-			if (!wm->drags.first) {
-				if (!data->tooltip && PIL_check_seconds_timer() - wm->last_tooltip_close < BUTTON_TOOLTIP_RESET)
-					data->tooltip = ui_tooltip_create(C, data->region, but);
-				else
-					data->tooltiptimer = WM_event_add_timer(data->wm, data->window, TIMER, BUTTON_TOOLTIP_DELAY);
-			}
-		}
-	}
+	if (U.flag & USER_TOOLTIPS)
+		if (!but->block->tooltipdisabled)
+			if (!wm->drags.first)
+				data->tooltiptimer = WM_event_add_timer(data->wm, data->window, TIMER, BUTTON_TOOLTIP_DELAY);
 }
 
 static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state)

Modified: branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c	2012-05-30 16:22:33 UTC (rev 47234)
+++ branches/soc-2012-bratwurst/source/blender/editors/interface/interface_regions.c	2012-05-30 16:37:12 UTC (rev 47235)
@@ -64,8 +64,6 @@
 #include "BLF_api.h"
 #include "BLF_translation.h"
 
-#include "PIL_time.h"
-
 #include "ED_screen.h"
 
 #include "interface_intern.h"
@@ -690,8 +688,6 @@
 
 void ui_tooltip_free(bContext *C, ARegion *ar)
 {
-	CTX_wm_manager(C)->last_tooltip_close = PIL_check_seconds_timer();
-
 	ui_remove_temporary_region(C, CTX_wm_screen(C), ar);
 }
 

Modified: branches/soc-2012-bratwurst/source/blender/makesdna/DNA_windowmanager_types.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesdna/DNA_windowmanager_types.h	2012-05-30 16:22:33 UTC (rev 47234)
+++ branches/soc-2012-bratwurst/source/blender/makesdna/DNA_windowmanager_types.h	2012-05-30 16:37:12 UTC (rev 47235)
@@ -149,7 +149,6 @@
 
 	ListBase timers;					/* active timers */
 	struct wmTimer *autosavetimer;		/* timer for auto save */
-	double last_tooltip_close;
 } wmWindowManager;
 
 /* wmWindowManager.initialized */




More information about the Bf-blender-cvs mailing list