procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'multi-window-maximized' into 'master'

Browse source 
Issue #379: "Windowed Mode" doesn't remember maximize state in multi-window mode

See merge request GNOME/gimp!1104
This commit is contained in:
Alx Sa 2025-07-01 15:44:46 +00:00
commit e41d33a2ab
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/display/gimpimagewindow.c
View file

@ -1040,6 +1040,7 @@ static GList *
gimp_image_window_get_aux_info (GimpSessionManaged *session_managed) gimp_image_window_get_aux_info (GimpSessionManaged *session_managed)
{ {
GList *aux_info = NULL; GList *aux_info = NULL;
GimpSessionInfoAux *aux;
GimpImageWindowPrivate *private; GimpImageWindowPrivate *private;
GimpGuiConfig *config; GimpGuiConfig *config;
@ -1050,9 +1051,8 @@ gimp_image_window_get_aux_info (GimpSessionManaged *session_managed)
if (config->single_window_mode) if (config->single_window_mode)
{ {
GimpSessionInfoAux *aux; GtkAllocation allocation;
GtkAllocation allocation; gchar widthbuf[128];
gchar widthbuf[128];
g_snprintf (widthbuf, sizeof (widthbuf), "%d", g_snprintf (widthbuf, sizeof (widthbuf), "%d",
gtk_paned_get_position (GTK_PANED (private->left_hpane))); 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, aux = gimp_session_info_aux_new (GIMP_IMAGE_WINDOW_RIGHT_DOCKS_WIDTH,
widthbuf); widthbuf);
aux_info = g_list_append (aux_info, aux); 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; return aux_info;
} }

4
app/tests/gimpdir/sessionrc-expected
View file

@ -92,7 +92,9 @@
(factory-entry "gimp-empty-image-window") (factory-entry "gimp-empty-image-window")
(position 140 30) (position 140 30)
(size 610 190) (size 610 190)
(open-on-exit)) (open-on-exit)
(aux-info
(maximized "no")))
(session-info "toplevel" (session-info "toplevel"
(factory-entry "gimp-single-image-window") (factory-entry "gimp-single-image-window")
(position 10 40) (position 10 40)

4
app/tests/gimpdir/sessionrc-expected-multi-window
View file

@ -107,7 +107,9 @@
(factory-entry "gimp-empty-image-window") (factory-entry "gimp-empty-image-window")
(position 140 30) (position 140 30)
(size 610 190) (size 610 190)
(open-on-exit)) (open-on-exit)
(aux-info
(maximized "no")))
(session-info "toplevel" (session-info "toplevel"
(factory-entry "gimp-single-image-window") (factory-entry "gimp-single-image-window")
(position 10 40) (position 10 40)