diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js index 389860679..b5318ba28 100644 --- a/js/ui/dateMenu.js +++ b/js/ui/dateMenu.js @@ -49,7 +49,7 @@ const DateMenuButton = new Lang.Class({ menuAlignment = 1.0 - menuAlignment; this.parent(menuAlignment); - this._clockDisplay = new St.Label(); + this._clockDisplay = new St.Label({ y_align: Clutter.ActorAlign.CENTER }); this.actor.add_actor(this._clockDisplay); this.actor.add_style_class_name ('clock-display'); diff --git a/js/ui/panel.js b/js/ui/panel.js index 145005139..289a90b3d 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -214,7 +214,9 @@ const AppMenuButton = new Lang.Class({ this._label = new TextShadower(); this._label.actor.y_align = Clutter.ActorAlign.CENTER; this._hbox.add_actor(this._label.actor); - this._arrow = new St.Label({ text: '\u25BE' }); + this._arrow = new St.Label({ text: '\u25BE', + y_expand: true, + y_align: Clutter.ActorAlign.CENTER }); this._hbox.add_actor(this._arrow); this._iconBottomClip = 0; @@ -606,7 +608,8 @@ const ActivitiesButton = new Lang.Class({ /* Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview". */ - this._label = new St.Label({ text: _("Activities") }); + this._label = new St.Label({ text: _("Activities"), + y_align: Clutter.ActorAlign.CENTER }); this.actor.add_actor(this._label); this.actor.label_actor = this._label; @@ -858,7 +861,9 @@ const AggregateMenu = new Lang.Class({ this._indicators.add_child(this._power.indicators); this._indicators.add_child(this._volume.indicators); this._indicators.add_child(this._system.indicators); - this._indicators.add_child(new St.Label({ text: '\u25BE' })); + this._indicators.add_child(new St.Label({ text: '\u25BE', + y_expand: true, + y_align: Clutter.ActorAlign.CENTER })); this.menu.addMenuItem(this._volume.menu); this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js index 5dd8d4454..f6c48a450 100644 --- a/js/ui/panelMenu.js +++ b/js/ui/panelMenu.js @@ -86,13 +86,8 @@ const ButtonBox = new Lang.Class({ childBox.x2 = availWidth - this._minHPadding; } - if (natHeight <= availHeight) { - childBox.y1 = Math.floor((availHeight - natHeight) / 2); - childBox.y2 = childBox.y1 + natHeight; - } else { - childBox.y1 = 0; - childBox.y2 = availHeight; - } + childBox.y1 = 0; + childBox.y2 = availHeight; child.allocate(childBox, flags); }, diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js index 149c84aae..35d92e2bd 100644 --- a/js/ui/status/accessibility.js +++ b/js/ui/status/accessibility.js @@ -1,5 +1,6 @@ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +const Clutter = imports.gi.Clutter; const Gio = imports.gi.Gio; const Lang = imports.lang; const Mainloop = imports.mainloop; @@ -39,7 +40,9 @@ const ATIndicator = new Lang.Class({ this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon', icon_name: 'preferences-desktop-accessibility-symbolic' })); - this._hbox.add_child(new St.Label({ text: '\u25BE' })); + this._hbox.add_child(new St.Label({ text: '\u25BE', + y_expand: true, + y_align: Clutter.ActorAlign.CENTER })); this.actor.add_child(this._hbox); diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js index ea365c4c0..daa757dbf 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js @@ -340,9 +340,11 @@ const InputSourceIndicator = new Lang.Class({ this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); this._hbox.add_child(this._container); - this._hbox.add_child(new St.Label({ text: '\u25BE' })); + this._hbox.add_child(new St.Label({ text: '\u25BE', + y_expand: true, + y_align: Clutter.ActorAlign.CENTER })); - this.actor.add(this._hbox, { y_expand: true }); + this.actor.add_child(this._hbox); this.actor.add_style_class_name('panel-status-button'); // All valid input sources currently in the gsettings @@ -906,7 +908,7 @@ const InputSourceIndicator = new Lang.Class({ for (let i in this._inputSources) { let is = this._inputSources[i]; - is.indicatorLabel.allocate_align_fill(box, 0.5, 0, false, false, flags); + is.indicatorLabel.allocate_align_fill(box, 0.5, 0.5, false, false, flags); } } });