Move the last window-related NIW code from the shell to the image window
This commit is contained in:
@ -1256,11 +1256,6 @@ gimp_display_shell_new (GimpDisplay *display,
|
||||
}
|
||||
else
|
||||
{
|
||||
/* FIXME image window */
|
||||
gimp_statusbar_empty (GIMP_STATUSBAR (GIMP_IMAGE_WINDOW (shell)->statusbar));
|
||||
gimp_dialog_factory_add_foreign (display_factory,
|
||||
"gimp-empty-image-window",
|
||||
GTK_WIDGET (shell));
|
||||
gimp_help_set_help_data (shell->canvas,
|
||||
_("Drop image files here to open them"),
|
||||
NULL);
|
||||
|
||||
@ -449,6 +449,15 @@ gimp_image_window_set_active_display (GimpImageWindow *window,
|
||||
G_CALLBACK (gimp_image_window_shell_icon_notify),
|
||||
window);
|
||||
|
||||
if (! display->image)
|
||||
{
|
||||
gimp_statusbar_empty (GIMP_STATUSBAR (window->statusbar));
|
||||
|
||||
gimp_dialog_factory_add_foreign (window->display_factory,
|
||||
"gimp-empty-image-window",
|
||||
GTK_WIDGET (window));
|
||||
}
|
||||
|
||||
gimp_ui_manager_update (window->menubar_manager,
|
||||
window->active_display);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user