[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54950] trunk/blender/source/blender/ editors/interface: fix for drag-toggle, bit-buttons weren' t handled which made drag toggle fail for buttons in the graph editor for eg .

Campbell Barton ideasman42 at gmail.com
Fri Mar 1 01:35:01 CET 2013


Revision: 54950
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54950
Author:   campbellbarton
Date:     2013-03-01 00:35:01 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
fix for drag-toggle, bit-buttons weren't handled which made drag toggle fail for buttons in the graph editor for eg.

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-03-01 00:19:32 UTC (rev 54949)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-03-01 00:35:01 UTC (rev 54950)
@@ -776,12 +776,12 @@
 #ifdef USE_DRAG_TOGGLE
 		if (ui_is_but_bool(but)) {
 			/* assumes button has already been pressed */
-			const bool is_set = (ui_get_but_val(but) == 0.0);
+			const bool is_set = ui_is_but_push(but);
 			PointerRNA ptr;
 			/* auto-key is typically called on mouse-up, but we'r leaving the button so call here */
 			ui_apply_autokey(C, but);
 			WM_operator_properties_create(&ptr, "UI_OT_drag_toggle");
-			RNA_boolean_set(&ptr, "state", !is_set);
+			RNA_boolean_set(&ptr, "state", is_set);
 			RNA_int_set(&ptr, "last_x", data->dragstartx);
 			RNA_int_set(&ptr, "last_y", data->dragstarty);
 			WM_operator_name_call(C, "UI_OT_drag_toggle", WM_OP_INVOKE_DEFAULT, &ptr);

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2013-03-01 00:19:32 UTC (rev 54949)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2013-03-01 00:35:01 UTC (rev 54950)
@@ -1103,7 +1103,7 @@
 					/* execute the button */
 					if (ui_is_but_bool(but) && but->type == but_type_start) {
 						/* is it pressed? */
-						bool is_set_but = (ui_get_but_val(but) != 0.0);
+						bool is_set_but = ui_is_but_push(but);
 						BLI_assert(ui_is_but_bool(but) == true);
 						if (is_set_but != is_set) {
 							uiButExecute(C, but);




More information about the Bf-blender-cvs mailing list