+2007-12-27 [colin] 3.2.0cvs17
+
+ * src/main.c
+ * src/mainwindow.c
+ * src/prefs_common.c
+ * src/prefs_common.h
+ Fix bug 1439, 'Claws Mail does not remember window size
+ state when restarted'. Save maximised state and force
+ maximisation at startup if applicable.
+
2007-12-23 [paul] 3.2.0cvs16
* src/prefs_matcher.c
( cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/common/ssl_certificate.c; ) > 3.2.0cvs14.patchset
( cvs diff -u -r 1.382.2.427 -r 1.382.2.428 src/compose.c; ) > 3.2.0cvs15.patchset
( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/prefs_matcher.c; ) > 3.2.0cvs16.patchset
+( cvs diff -u -r 1.115.2.178 -r 1.115.2.179 src/main.c; cvs diff -u -r 1.274.2.225 -r 1.274.2.226 src/mainwindow.c; cvs diff -u -r 1.204.2.159 -r 1.204.2.160 src/prefs_common.c; cvs diff -u -r 1.103.2.103 -r 1.103.2.104 src/prefs_common.h; ) > 3.2.0cvs17.patchset
}
allocation = &mainwin->window->allocation;
- if (allocation->width > 1 && allocation->height > 1) {
+ if (allocation->width > 1 && allocation->height > 1 &&
+ !prefs_common.mainwin_maximised) {
prefs_common.mainview_height = allocation->height;
prefs_common.mainwin_width = allocation->width;
prefs_common.mainwin_height = allocation->height;
{
gint x, y;
+ if (prefs_common.mainwin_maximised)
+ return;
+
gtkut_widget_get_uposition(mainwin->window, &x, &y);
prefs_common.mainview_x = x;
main_window_show(mainwin);
gtkut_window_popup(mainwin->window);
+
+ if (prefs_common.mainwin_maximised)
+ gtk_window_maximize(GTK_WINDOW(mainwin->window));
+
if (prefs_common.layout_mode == SMALL_LAYOUT) {
if (mainwin->in_folder) {
mainwindow_enter_folder(mainwin);
if (iconified_count > 0)
hooks_invoke(MAIN_WINDOW_GOT_ICONIFIED, NULL);
iconified_count++;
+ } else if (!claws_is_starting()) {
+ prefs_common.mainwin_maximised =
+ ((state->new_window_state&GDK_WINDOW_STATE_MAXIMIZED) != 0);
}
if (state->new_window_state == 0)
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(widget), FALSE);
NULL, NULL, NULL},
{"mainwin_y", "64", &prefs_common.mainwin_y, P_INT,
NULL, NULL, NULL},
+ {"mainwin_maximised", "FALSE", &prefs_common.mainwin_maximised, P_BOOL,
+ NULL, NULL, NULL},
#ifndef MAEMO
{"mainwin_width", "800", &prefs_common.mainwin_width, P_INT,
NULL, NULL, NULL},