diff options
Diffstat (limited to 'wikipedia')
| -rw-r--r-- | wikipedia/PrebuiltCategoryPage.js | 1 | ||||
| -rw-r--r-- | wikipedia/widgets/ListTextButton.js | 2 | ||||
| -rw-r--r-- | wikipedia/widgets/category_button.js | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/wikipedia/PrebuiltCategoryPage.js b/wikipedia/PrebuiltCategoryPage.js index 3ad3ebf..bb9da5b 100644 --- a/wikipedia/PrebuiltCategoryPage.js +++ b/wikipedia/PrebuiltCategoryPage.js @@ -94,7 +94,6 @@ const PrebuiltCategoryPage = new Lang.Class({ this._description_text_view = new FixedSizeTextView.FixedSizeTextView({ name:"category_description", - margin_left: 6, // stupid Benton Sans correction sensitive: false, editable: false, cursor_visible: false diff --git a/wikipedia/widgets/ListTextButton.js b/wikipedia/widgets/ListTextButton.js index a3a141b..b676b8c 100644 --- a/wikipedia/widgets/ListTextButton.js +++ b/wikipedia/widgets/ListTextButton.js @@ -6,7 +6,7 @@ const Pango = imports.gi.Pango; // This is an approximate number of characters that will keep the label from // going over its specified width -const ARTICLE_LABEL_MAX_WIDTH_CHARS = 24; +const ARTICLE_LABEL_MAX_WIDTH_CHARS = 22; const ListTextButton = new Lang.Class({ Name: 'EndlessListTextButton', diff --git a/wikipedia/widgets/category_button.js b/wikipedia/widgets/category_button.js index ade1f21..54f0b79 100644 --- a/wikipedia/widgets/category_button.js +++ b/wikipedia/widgets/category_button.js @@ -10,8 +10,10 @@ const CATEGORY_LABEL_LEFT_MARGIN = 25; // pixels const CATEGORY_LABEL_BOTTOM_MARGIN = 20; // pixels const CATEGORY_BUTTON_RIGHT_MARGIN = 20; // pixels const CATEGORY_BUTTON_BOTTOM_MARGIN = 20; // pixels -const CATEGORY_LABEL_BENTON_SANS_CORRECTION = 0; // pixels -const CATEGORY_BUTTON_BENTON_SANS_CORRECTION = 10; // pixels +// The following two are corrections because GTK 3.8 doesn't have baseline +// alignment. Remove and align properly in GTK 3.10. FIXME +const CATEGORY_LABEL_BASELINE_CORRECTION = 0; // pixels +const CATEGORY_BUTTON_BASELINE_CORRECTION = 10; // pixels const _HOVER_ARROW_URI = '/com/endlessm/wikipedia-domain/assets/category_hover_arrow.png'; const MAIN_CATEGORY_SCREEN_WIDTH_PERCENTAGE = 0.37; @@ -71,7 +73,7 @@ const CategoryButton = new Lang.Class({ }); this._label = new Gtk.Label({ margin_left: CATEGORY_LABEL_LEFT_MARGIN, - margin_bottom: CATEGORY_LABEL_BOTTOM_MARGIN - CATEGORY_LABEL_BENTON_SANS_CORRECTION, + margin_bottom: CATEGORY_LABEL_BOTTOM_MARGIN - CATEGORY_LABEL_BASELINE_CORRECTION, hexpand: true, halign: Gtk.Align.START, xalign: 0.0, // deprecated Gtk.Misc properties; necessary because @@ -80,7 +82,7 @@ const CategoryButton = new Lang.Class({ this._arrow = new Gtk.Image({ resource: _HOVER_ARROW_URI, margin_right: CATEGORY_BUTTON_RIGHT_MARGIN, - margin_bottom: CATEGORY_BUTTON_BOTTOM_MARGIN + CATEGORY_BUTTON_BENTON_SANS_CORRECTION, + margin_bottom: CATEGORY_BUTTON_BOTTOM_MARGIN + CATEGORY_BUTTON_BASELINE_CORRECTION, halign: Gtk.Align.END, valign: Gtk.Align.END, opacity: 0 |