From df2a48590749901b1652d1357388dbc2a3338e87 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 8 Sep 2015 21:53:24 +0200 Subject: [PATCH] Bug 754713 - On-canvas dialog of color picker tool always displays... ...in initially active tab gimp_tool_gui_update_shell(): implement the "overlay" case and hide the gui on the previous shell, then show it on the new one. --- app/display/gimptoolgui.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/display/gimptoolgui.c b/app/display/gimptoolgui.c index 16a44198cc..e12bb306e1 100644 --- a/app/display/gimptoolgui.c +++ b/app/display/gimptoolgui.c @@ -785,7 +785,17 @@ gimp_tool_gui_update_shell (GimpToolGui *gui) { GimpToolGuiPrivate *private = GET_PRIVATE (gui); - if (! private->overlay) + if (private->overlay) + { + if (gtk_widget_get_parent (private->dialog)) + { + gimp_tool_gui_hide (gui); + + if (private->shell) + gimp_tool_gui_show (gui); + } + } + else { gimp_tool_dialog_set_shell (GIMP_TOOL_DIALOG (private->dialog), private->shell);