From e4920b2f80c096b8c30f55f54cfe2a2f29fc542e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 10 Sep 2019 07:36:58 +0200 Subject: [PATCH] pageIndicators: Use Clutter.Orientation as orientation parameter https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559 --- js/ui/keyboard.js | 4 +++- js/ui/pageIndicators.js | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js index 2f66c240a..d7a6999b2 100644 --- a/js/ui/keyboard.js +++ b/js/ui/keyboard.js @@ -906,7 +906,9 @@ var EmojiSelection = GObject.registerClass({ }); this.add(this._emojiPager, { expand: true }); - this._pageIndicator = new PageIndicators.PageIndicators(false); + this._pageIndicator = new PageIndicators.PageIndicators( + Clutter.Orientation.HORIZONTAL + ); this.add(this._pageIndicator, { expand: true, x_fill: false, y_fill: false }); this._pageIndicator.setReactive(false); diff --git a/js/ui/pageIndicators.js b/js/ui/pageIndicators.js index 8d81fd0f3..5ed7f879d 100644 --- a/js/ui/pageIndicators.js +++ b/js/ui/pageIndicators.js @@ -20,14 +20,17 @@ var ANIMATION_DELAY = 100; var PageIndicators = GObject.registerClass({ Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } } }, class PageIndicators extends St.BoxLayout { - _init(vertical = true) { - super._init({ style_class: 'page-indicators', - vertical, - x_expand: true, y_expand: true, - x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER, - y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END, - reactive: true, - clip_to_allocation: true }); + _init(orientation = Clutter.Orientation.VERTICAL) { + let vertical = orientation == Clutter.Orientation.VERTICAL; + super._init({ + style_class: 'page-indicators', + vertical, + x_expand: true, y_expand: true, + x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER, + y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END, + reactive: true, + clip_to_allocation: true + }); this._nPages = 0; this._currentPage = undefined; this._reactive = true; @@ -93,7 +96,7 @@ var PageIndicators = GObject.registerClass({ var AnimatedPageIndicators = GObject.registerClass( class AnimatedPageIndicators extends PageIndicators { _init() { - super._init(true); + super._init(); this.connect('notify::mapped', () => { if (!this.mapped)