summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 17:13:49 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-31 17:13:49 +0000
commit9821c23f2d7ca532bec46158ecb4bdd73a2a5483 (patch)
tree456396c13184ddbbbdbba1d618af8e4b7c0f8184 /chrome/browser/gtk
parent8e71c01884750cb17ffc49a288b0c1b53a32741f (diff)
downloadchromium_src-9821c23f2d7ca532bec46158ecb4bdd73a2a5483.zip
chromium_src-9821c23f2d7ca532bec46158ecb4bdd73a2a5483.tar.gz
chromium_src-9821c23f2d7ca532bec46158ecb4bdd73a2a5483.tar.bz2
Linux: make search engines dialog size based on locale settings.
BUG=20453 TEST=none Review URL: http://codereview.chromium.org/180034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/keyword_editor_view.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/gtk/keyword_editor_view.cc b/chrome/browser/gtk/keyword_editor_view.cc
index f2dc7f5..1409dc1 100644
--- a/chrome/browser/gtk/keyword_editor_view.cc
+++ b/chrome/browser/gtk/keyword_editor_view.cc
@@ -16,13 +16,10 @@
#include "chrome/common/gtk_tree.h"
#include "chrome/common/gtk_util.h"
#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
namespace {
-// Initial size for dialog.
-const int kDialogDefaultWidth = 450;
-const int kDialogDefaultHeight = 450;
-
// How many rows should be added to an index into the |table_model_| to get the
// corresponding row in |list_store_|
const int kFirstGroupRowOffset = 2;
@@ -82,8 +79,6 @@ void KeywordEditorView::Init() {
GTK_RESPONSE_CLOSE,
NULL);
- gtk_window_set_default_size(GTK_WINDOW(dialog_), kDialogDefaultWidth,
- kDialogDefaultHeight);
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
gtk_util::kContentAreaSpacing);
@@ -185,6 +180,16 @@ void KeywordEditorView::Init() {
EnableControls();
+ // Set the size of the dialog.
+ gtk_widget_realize(dialog_);
+ int width = 1, height = 1;
+ gtk_util::GetWidgetSizeFromResources(
+ dialog_,
+ IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS,
+ IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES,
+ &width, &height);
+ gtk_window_set_default_size(GTK_WINDOW(dialog_), width, height);
+
g_signal_connect(dialog_, "response", G_CALLBACK(OnResponse), this);
g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroy), this);
}