Bug 794356 - Rulers always shown for subsequent image views

Remove the connect_after() hack from GimpImageWindow again and instead
add gimp_display_shell_canvas_realize_after() and restore the configured
ruler visibility there. Should work for all cases now.
This commit is contained in:
Michael Natterer
2018-04-03 22:36:17 +02:00
parent 65a697ff67
commit 7230d5d777
4 changed files with 22 additions and 11 deletions

View File

@ -479,17 +479,9 @@ gimp_image_window_constructed (GObject *object)
gtk_paned_pack1 (GTK_PANED (private->right_hpane), private->notebook,
TRUE, TRUE);
/* HACK: remove with GTK+ 3.x: there is no reason to
* connect_after() here except the HACK at the end of
* gimp_display_shell_canvas_realize().
*
* We need to make sure gimp_display_shell_appearance_update() is
* called after realize() so the ill-shown rulers are properly
* hidden again
*/
g_signal_connect_after (private->notebook, "switch-page",
G_CALLBACK (gimp_image_window_switch_page),
window);
g_signal_connect (private->notebook, "switch-page",
G_CALLBACK (gimp_image_window_switch_page),
window);
g_signal_connect (private->notebook, "page-removed",
G_CALLBACK (gimp_image_window_page_removed),
window);