isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dateMenu: Remove custom aligning of time strings in the World Clocks

Browse Source 
Since now Glib uses tabular space for aligning numbers (merged in
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2698), there is no
more need for custom aligning.

Fixes https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5438

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2340>
This commit is contained in:
Maksym Hazevych 2022-06-20 17:43:09 +03:00 committed by Marge Bot
parent c04fb61ec5
commit 2a3d409114
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/dateMenu.js
View File

@ -418,10 +418,7 @@ class WorldClocksSection extends St.Button {
x_expand: true, x_expand: true,
}); });
let time = new St.Label({ let time = new St.Label({ style_class: 'world-clocks-time' });
style_class: 'world-clocks-time',
x_align: Clutter.ActorAlign.END,
});
const tz = new St.Label({ const tz = new St.Label({
style_class: 'world-clocks-timezone', style_class: 'world-clocks-timezone',
@ -487,25 +484,10 @@ class WorldClocksSection extends St.Button {
} }
_updateTimeLabels() { _updateTimeLabels() {
let differentLength = false;
let lastLength;
for (let i = 0; i < this._locations.length; i++) { for (let i = 0; i < this._locations.length; i++) {
let l = this._locations[i]; let l = this._locations[i];
const now = GLib.DateTime.new_now(l.location.get_timezone()); const now = GLib.DateTime.new_now(l.location.get_timezone());
const text = Util.formatTime(now, { timeOnly: true }); l.timeLabel.text = Util.formatTime(now, { timeOnly: true });
l.timeLabel.text = text;
if (differentLength)
continue;
if (lastLength === undefined)
lastLength = text.length;
differentLength = lastLength !== text.length;
}
for (let i = 0; i < this._locations.length; i++) {
this._locations[i].timeLabel.x_align = differentLength
? Clutter.ActorAlign.START
: Clutter.ActorAlign.END;
} }
} }