mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 09:23:24 +00:00
Merge branch 'multi-window-maximized' into 'master'
Issue #379: "Windowed Mode" doesn't remember maximize state in multi-window mode See merge request GNOME/gimp!1104
This commit is contained in:
commit
e41d33a2ab
3 changed files with 14 additions and 10 deletions
|
@ -1040,6 +1040,7 @@ static GList *
|
|||
gimp_image_window_get_aux_info (GimpSessionManaged *session_managed)
|
||||
{
|
||||
GList *aux_info = NULL;
|
||||
GimpSessionInfoAux *aux;
|
||||
GimpImageWindowPrivate *private;
|
||||
GimpGuiConfig *config;
|
||||
|
||||
|
@ -1050,9 +1051,8 @@ gimp_image_window_get_aux_info (GimpSessionManaged *session_managed)
|
|||
|
||||
if (config->single_window_mode)
|
||||
{
|
||||
GimpSessionInfoAux *aux;
|
||||
GtkAllocation allocation;
|
||||
gchar widthbuf[128];
|
||||
GtkAllocation allocation;
|
||||
gchar widthbuf[128];
|
||||
|
||||
g_snprintf (widthbuf, sizeof (widthbuf), "%d",
|
||||
gtk_paned_get_position (GTK_PANED (private->left_hpane)));
|
||||
|
@ -1068,13 +1068,13 @@ gimp_image_window_get_aux_info (GimpSessionManaged *session_managed)
|
|||
aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_RIGHT_DOCKS_WIDTH,
|
||||
widthbuf);
|
||||
aux_info = g_list_append (aux_info, aux);
|
||||
|
||||
aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_MAXIMIZED,
|
||||
gimp_image_window_is_maximized (GIMP_IMAGE_WINDOW (session_managed)) ?
|
||||
"yes" : "no");
|
||||
aux_info = g_list_append (aux_info, aux);
|
||||
}
|
||||
|
||||
aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_MAXIMIZED,
|
||||
gimp_image_window_is_maximized (GIMP_IMAGE_WINDOW (session_managed)) ?
|
||||
"yes" : "no");
|
||||
aux_info = g_list_append (aux_info, aux);
|
||||
|
||||
return aux_info;
|
||||
}
|
||||
|
||||
|
|
|
@ -92,7 +92,9 @@
|
|||
(factory-entry "gimp-empty-image-window")
|
||||
(position 140 30)
|
||||
(size 610 190)
|
||||
(open-on-exit))
|
||||
(open-on-exit)
|
||||
(aux-info
|
||||
(maximized "no")))
|
||||
(session-info "toplevel"
|
||||
(factory-entry "gimp-single-image-window")
|
||||
(position 10 40)
|
||||
|
|
|
@ -107,7 +107,9 @@
|
|||
(factory-entry "gimp-empty-image-window")
|
||||
(position 140 30)
|
||||
(size 610 190)
|
||||
(open-on-exit))
|
||||
(open-on-exit)
|
||||
(aux-info
|
||||
(maximized "no")))
|
||||
(session-info "toplevel"
|
||||
(factory-entry "gimp-single-image-window")
|
||||
(position 10 40)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue