[evince] Revert "ev-page-action-widget: Reduce width of the widget"
- From: Germán Poo-Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] Revert "ev-page-action-widget: Reduce width of the widget"
- Date: Tue, 31 Jul 2018 20:40:59 +0000 (UTC)
commit 1a38f68fd9cb488cd6ccb8bd2fb17b677068bbdd
Author: Germán Poo-Caamaño <gpoo gnome org>
Date: Tue Jul 31 15:33:32 2018 -0400
Revert "ev-page-action-widget: Reduce width of the widget"
This reverts commit 3d9aeb5ac8036d14db879b198fdeabf42565b8ff.
The label turned out to look odd. Reverting back to GtkEntry
to make look EvPageActionWidget like a single widget.
See #947
libmisc/ev-page-action-widget.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/libmisc/ev-page-action-widget.c b/libmisc/ev-page-action-widget.c
index af0275fe..0d2e10d5 100644
--- a/libmisc/ev-page-action-widget.c
+++ b/libmisc/ev-page-action-widget.c
@@ -85,7 +85,7 @@ update_pages_label (EvPageActionWidget *action_widget,
label_text = g_strdup_printf (_("(%d of %d)"), page + 1, n_pages);
else
label_text = g_strdup_printf (_("of %d"), n_pages);
- gtk_label_set_text (GTK_LABEL (action_widget->label), label_text);
+ gtk_entry_set_text (GTK_ENTRY (action_widget->label), label_text);
g_free (label_text);
}
@@ -130,7 +130,7 @@ ev_page_action_widget_update_max_width (EvPageActionWidget *action_widget)
}
g_free (max_page_label);
- gtk_label_set_width_chars (GTK_LABEL (action_widget->label), max_label_len);
+ gtk_entry_set_width_chars (GTK_ENTRY (action_widget->label), max_label_len);
g_free (max_label);
max_label_len = ev_document_get_max_label_len (action_widget->document);
@@ -210,9 +210,14 @@ ev_page_action_widget_init (EvPageActionWidget *action_widget)
{
GtkWidget *hbox;
AtkObject *obj;
+ GtkStyleContext *style_context;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ style_context = gtk_widget_get_style_context (hbox);
+ gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_RAISED);
+ gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_LINKED);
+
action_widget->entry = gtk_entry_new ();
gtk_widget_add_events (action_widget->entry,
GDK_BUTTON_MOTION_MASK);
@@ -236,8 +241,9 @@ ev_page_action_widget_init (EvPageActionWidget *action_widget)
FALSE, FALSE, 0);
gtk_widget_show (action_widget->entry);
- action_widget->label = gtk_label_new (NULL);
- gtk_label_set_width_chars (GTK_LABEL (action_widget->label), 5);
+ action_widget->label = gtk_entry_new ();
+ gtk_widget_set_sensitive (action_widget->label, FALSE);
+ gtk_entry_set_width_chars (GTK_ENTRY (action_widget->label), 5);
gtk_box_pack_start (GTK_BOX (hbox), action_widget->label,
FALSE, FALSE, 0);
gtk_widget_show (action_widget->label);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]