commit 683c36060f1289e8b63bb97554fb72a1a00c7f3e
parent b537038c0c45eb0092a17e7d96bc849141540744
Author: paul <paul@claws-mail.org>
Date: Thu, 5 Dec 2019 13:36:22 +0000
fix some unshrinkable windows
Diffstat:
12 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/account.c b/src/account.c
@@ -852,7 +852,7 @@ static void account_edit_create(void)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.accountswin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.accountswin_width,
prefs_common.accountswin_height);
#ifdef G_OS_WIN32
gtk_window_move(GTK_WINDOW(window), 48, 48);
diff --git a/src/action.c b/src/action.c
@@ -1298,8 +1298,8 @@ static void create_io_dialog(Children *children)
debug_print("Creating action IO dialog\n");
dialog = gtk_dialog_new();
- gtk_container_set_border_width
- (GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 5);
+// gtk_container_set_border_width
+// (GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), 5);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
gtk_window_set_title(GTK_WINDOW(dialog), _("Action's input/output"));
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
@@ -1420,7 +1420,7 @@ static void create_io_dialog(Children *children)
gtk_window_set_geometry_hints(GTK_WINDOW(dialog), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(dialog, prefs_common.actionsiodialog_width,
+ gtk_window_set_default_size(GTK_WINDOW(dialog), prefs_common.actionsiodialog_width,
prefs_common.actionsiodialog_height);
gtk_widget_show(dialog);
diff --git a/src/compose.c b/src/compose.c
@@ -7772,8 +7772,8 @@ static Compose *compose_create(PrefsAccount *account,
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
- gtk_widget_set_size_request(window, prefs_common.compose_width,
- prefs_common.compose_height);
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.compose_width,
+ prefs_common.compose_height);
if (!geometry.max_width) {
geometry.max_width = gdk_screen_width();
diff --git a/src/edittags.c b/src/edittags.c
@@ -621,7 +621,7 @@ static void apply_window_create(void)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.tagswin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.tagswin_width,
prefs_common.tagswin_height);
applywindow.window = window;
diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -140,7 +140,7 @@ LogWindow *log_window_create(LogInstance instance)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, *prefs_logwin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), *prefs_logwin_width,
*prefs_logwin_height);
logwin->window = window;
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
@@ -302,6 +302,7 @@ void pluginwindow_create()
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
gtk_window_set_title(GTK_WINDOW(window), _("Plugins"));
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
manage_window_set_transient(GTK_WINDOW(window));
@@ -420,14 +421,6 @@ void pluginwindow_create()
CLAWS_SET_TIP(unload_btn,
_("Unload the selected plugin"));
- pluginwindow->window = window;
- pluginwindow->plugin_list_view = plugin_list_view;
- pluginwindow->plugin_desc = plugin_desc;
- pluginwindow->unload_btn = unload_btn;
- pluginwindow->selected_plugin = NULL;
-
- set_plugin_list(pluginwindow);
-
inc_lock();
if (!geometry.min_height) {
@@ -441,6 +434,15 @@ void pluginwindow_create()
prefs_common.pluginswin_height);
gtk_widget_show(window);
+
+ pluginwindow->window = window;
+ pluginwindow->plugin_list_view = plugin_list_view;
+ pluginwindow->plugin_desc = plugin_desc;
+ pluginwindow->unload_btn = unload_btn;
+ pluginwindow->selected_plugin = NULL;
+
+ set_plugin_list(pluginwindow);
+
}
static GtkListStore* pluginwindow_create_data_store(void)
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
@@ -678,7 +678,7 @@ static SieveManagerPage *sieve_manager_page_new()
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, sieve_config.manager_win_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), sieve_config.manager_win_width,
sieve_config.manager_win_height);
gtk_window_set_type_hint(GTK_WINDOW(window),
GDK_WINDOW_TYPE_HINT_DIALOG);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -401,7 +401,7 @@ static void prefs_actions_create(MainWindow *mainwin)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.actionswin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.actionswin_width,
prefs_common.actionswin_height);
gtk_widget_show(window);
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -570,7 +570,7 @@ static void prefs_filtering_create(void)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.filteringwin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.filteringwin_width,
prefs_common.filteringwin_height);
gtk_widget_show_all(window);
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
@@ -629,7 +629,7 @@ static void prefs_filtering_action_create(void)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.filteringactionwin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.filteringactionwin_width,
prefs_common.filteringactionwin_height);
g_object_unref(G_OBJECT(size_group));
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -857,7 +857,7 @@ static void prefs_matcher_create(void)
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
- gtk_widget_set_size_request(window, prefs_common.matcherwin_width,
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.matcherwin_width,
prefs_common.matcherwin_height);
gtk_widget_show_all(window);
diff --git a/src/sourcewindow.c b/src/sourcewindow.c
@@ -65,8 +65,6 @@ SourceWindow *source_window_create(void)
gtk_window_set_title(GTK_WINDOW(window), _("Source of the message"));
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_widget_set_size_request(window, prefs_common.sourcewin_width,
- prefs_common.sourcewin_height);
if (!geometry.min_height) {
geometry.min_width = 400;
@@ -74,6 +72,8 @@ SourceWindow *source_window_create(void)
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
GDK_HINT_MIN_SIZE);
+ gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.sourcewin_width,
+ prefs_common.sourcewin_height);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(source_window_size_alloc_cb),
