callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: Rememeber if image windows are opened

Browse Source 
Rememeber if image windows are opened because we want the
gimp_session_info_restore() code to run for the single-image window
once that code is in place.
This commit is contained in:
Martin Nordholts
2011-05-14 18:16:31 +02:00
parent a456a70bfd
commit 10aa3921a0
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dialogs/dialogs.c
View File

@ -82,7 +82,7 @@ GimpContainer *global_recent_docks = NULL;
singleton /* singleton */, \ singleton /* singleton */, \
TRUE /* session_managed */, \ TRUE /* session_managed */, \
remember_size /* remember_size */, \ remember_size /* remember_size */, \
FALSE /* remember_if_open */, \ TRUE /* remember_if_open */, \
FALSE /* hideable */, \ FALSE /* hideable */, \
TRUE /* image_window */, \ TRUE /* image_window */, \
FALSE /* dockable */} FALSE /* dockable */}

3
app/tests/gimpdir/sessionrc-2-8
View File

@ -90,7 +90,8 @@
(session-info "toplevel" (session-info "toplevel"
(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))
(session-info "toplevel" (session-info "toplevel"
(factory-entry "gimp-single-image-window") (factory-entry "gimp-single-image-window")
(position 10 40) (position 10 40)

3
app/tests/gimpdir/sessionrc-expected
View File

@ -90,7 +90,8 @@
(session-info "toplevel" (session-info "toplevel"
(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))
(session-info "toplevel" (session-info "toplevel"
(factory-entry "gimp-single-image-window") (factory-entry "gimp-single-image-window")
(position 10 40) (position 10 40)

21
app/widgets/gimpsessioninfo.c
View File

@ -488,15 +488,18 @@ gimp_session_info_restore (GimpSessionInfo *info,
info); info);
} }
/* We expect expect there to always be docks. In sessionrc files if (dialog && GIMP_IS_DOCK_CONTAINER (dialog))
* from <= 2.6 not all dock window entries had dock entries, but we {
* take care of that during sessionrc parsing /* We expect expect there to always be docks. In sessionrc files
*/ * from <= 2.6 not all dock window entries had dock entries, but we
for (iter = info->p->docks; iter; iter = g_list_next (iter)) * take care of that during sessionrc parsing
gimp_session_info_dock_restore ((GimpSessionInfoDock *)iter->data, */
factory, for (iter = info->p->docks; iter; iter = g_list_next (iter))
screen, gimp_session_info_dock_restore ((GimpSessionInfoDock *)iter->data,
GIMP_DOCK_CONTAINER (dialog)); factory,
screen,
GIMP_DOCK_CONTAINER (dialog));
}
g_object_unref (info); g_object_unref (info);
} }