From 92182495da881d54310bc6dd53afb91daf00116f Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Fri, 1 Mar 2019 13:14:16 -0300
Subject: Fix T62016: Outliner visibility icons drag behaviour broken

We are mixing bool and fancy 3-in-1 func-set buttons in the outliner.
So they would return different pushed state in
ui_drag_toggle_but_pushed_state().

We now have a callback function that allows the button to set its own
pushed_button_state callback function.

Note: This is a bit of overkill since we are planning to change the
3-in-1 outliner buttons. That said, it may be nice to have, since in the
future we can mix those buttons for other things.

Reviewers: brecht

Differential Revision: https://developer.blender.org/D4434
---
 source/blender/editors/interface/interface.c          |  6 ++++++
 source/blender/editors/interface/interface_handlers.c | 19 ++++++++++++-------
 source/blender/editors/interface/interface_intern.h   |  3 +++
 3 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'source/blender/editors/interface')

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 5c83410b955..f379432ede9 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -4456,6 +4456,12 @@ void UI_but_func_tooltip_set(uiBut *but, uiButToolTipFunc func, void *argN)
 	but->tip_argN = argN;
 }
 
+void UI_but_func_pushed_state_set(uiBut *but, uiButPushedStateFunc func, void *arg)
+{
+	but->pushed_state_func = func;
+	but->pushed_state_arg = arg;
+}
+
 uiBut *uiDefBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, const char *str, int x, int y, short width, short height, const char *tip)
 {
 	uiBut *but = ui_def_but(block, UI_BTYPE_BLOCK, 0, str, x, y, width, height, arg, 0.0, 0.0, 0.0, 0.0, tip);
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 507e0581020..498e2f07ea4 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1240,13 +1240,18 @@ static bool ui_drag_toggle_but_is_supported(const uiBut *but)
 
 /* Button pushed state to compare if other buttons match. Can be more
  * then just true or false for toggle buttons with more than 2 states. */
-static int ui_drag_toggle_but_pushed_state(uiBut *but)
+static int ui_drag_toggle_but_pushed_state(bContext *C, uiBut *but)
 {
 	if (but->rnapoin.data == NULL && but->poin == NULL && but->icon) {
-		/* Assume icon identifies a unique state, for buttons that
-		 * work though functions callbacks and don't have an boolean
-		 * value that indicates the state. */
-		return but->icon + but->iconadd;
+		if (but->pushed_state_func) {
+			return but->pushed_state_func(C, but->pushed_state_arg);
+		}
+		else {
+			/* Assume icon identifies a unique state, for buttons that
+			* work though functions callbacks and don't have an boolean
+			* value that indicates the state. */
+			return but->icon + but->iconadd;
+		}
 	}
 	else if (ui_but_is_bool(but)) {
 		return ui_but_is_pushed(but);
@@ -1295,7 +1300,7 @@ static bool ui_drag_toggle_set_xy_xy(
 					/* execute the button */
 					if (ui_drag_toggle_but_is_supported(but)) {
 						/* is it pressed? */
-						int pushed_state_but = ui_drag_toggle_but_pushed_state(but);
+						int pushed_state_but = ui_drag_toggle_but_pushed_state(C, but);
 						if (pushed_state_but != pushed_state) {
 							UI_but_execute(C, but);
 							if (do_check) {
@@ -1754,7 +1759,7 @@ static bool ui_but_drag_init(
 			 * typically 'button_activate_exit()' handles this */
 			ui_apply_but_autokey(C, but);
 
-			drag_info->pushed_state = ui_drag_toggle_but_pushed_state(but);
+			drag_info->pushed_state = ui_drag_toggle_but_pushed_state(C, but);
 			drag_info->but_cent_start[0] = BLI_rctf_cent_x(&but->rect);
 			drag_info->but_cent_start[1] = BLI_rctf_cent_y(&but->rect);
 			copy_v2_v2_int(drag_info->xy_init, &event->x);
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 19390a634fa..82d6115fbbb 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -320,6 +320,9 @@ struct uiBut {
 	void *editcoba;
 	void *editcumap;
 
+	uiButPushedStateFunc pushed_state_func;
+	void *pushed_state_arg;
+
 	/* pointer back */
 	uiBlock *block;
 };
-- 
cgit v1.2.3