From 12f0687cf55bb339ad9892cbce8c7d35a6509af5 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 30 Jul 2007 14:05:07 +0000 Subject: [PATCH] * src/maemo/modest-account-settings-dialog.c: * (create_page_user_details): use a scrolled window for options so that showing vkb does not hide the ok/cancel buttons. We also add proper focus adjustment (fixes NB#64537). * (create_page_outgoing): add proper focus adjustment. pmo-trunk-r2852 --- src/maemo/modest-account-settings-dialog.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index cea9426..5923034 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -400,11 +400,15 @@ static GtkWidget* create_page_user_details (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + GtkAdjustment *focus_adjustment = NULL; /* Create a size group to be used by all captions. * Note that HildonCaption does not create a default size group if we do not specify one. * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */ GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + GtkWidget *scrollwin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* The name widgets: */ self->entry_user_name = GTK_WIDGET (modest_validating_entry_new ()); @@ -499,8 +503,13 @@ create_page_user_details (ModestAccountSettingsDialog *self) G_CALLBACK (on_button_signature), self); gtk_widget_show (GTK_WIDGET (box)); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box); + gtk_widget_show (scrollwin); + + focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); - return GTK_WIDGET (box); + return GTK_WIDGET (scrollwin); } /** Change the caption title for the incoming server, @@ -697,6 +706,7 @@ on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data) static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + GtkAdjustment *focus_adjustment = NULL; /* Put it all in a scrolled window, so that all widgets can be * accessed even when the on-screen keyboard is visible: */ @@ -834,6 +844,9 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) gtk_widget_show (GTK_WIDGET (box)); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), box); gtk_widget_show(scrollwin); + + focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); return GTK_WIDGET (scrollwin); } -- 1.7.9.5