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

pageIndicators: Use Clutter.Orientation as orientation parameter

Browse Source 
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/559
This commit is contained in:
Marco Trevisan (Treviño) 2019-09-10 07:36:58 +02:00 committed by Florian Müllner
parent c9fbae3408
commit e4920b2f80
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/keyboard.js
View File

@ -906,7 +906,9 @@ var EmojiSelection = GObject.registerClass({
}); });
this.add(this._emojiPager, { expand: true }); 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.add(this._pageIndicator, { expand: true, x_fill: false, y_fill: false });
this._pageIndicator.setReactive(false); this._pageIndicator.setReactive(false);

11
js/ui/pageIndicators.js
View File

@ -20,14 +20,17 @@ var ANIMATION_DELAY = 100;
var PageIndicators = GObject.registerClass({ var PageIndicators = GObject.registerClass({
Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } } Signals: { 'page-activated': { param_types: [GObject.TYPE_INT] } }
}, class PageIndicators extends St.BoxLayout { }, class PageIndicators extends St.BoxLayout {
_init(vertical = true) { _init(orientation = Clutter.Orientation.VERTICAL) {
super._init({ style_class: 'page-indicators', let vertical = orientation == Clutter.Orientation.VERTICAL;
super._init({
style_class: 'page-indicators',
vertical, vertical,
x_expand: true, y_expand: true, x_expand: true, y_expand: true,
x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER, x_align: vertical ? Clutter.ActorAlign.END : Clutter.ActorAlign.CENTER,
y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END, y_align: vertical ? Clutter.ActorAlign.CENTER : Clutter.ActorAlign.END,
reactive: true, reactive: true,
clip_to_allocation: true }); clip_to_allocation: true
});
this._nPages = 0; this._nPages = 0;
this._currentPage = undefined; this._currentPage = undefined;
this._reactive = true; this._reactive = true;
@ -93,7 +96,7 @@ var PageIndicators = GObject.registerClass({
var AnimatedPageIndicators = GObject.registerClass( var AnimatedPageIndicators = GObject.registerClass(
class AnimatedPageIndicators extends PageIndicators { class AnimatedPageIndicators extends PageIndicators {
_init() { _init() {
super._init(true); super._init();
this.connect('notify::mapped', () => { this.connect('notify::mapped', () => {
if (!this.mapped) if (!this.mapped)