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

appDisplay: Turn navigation arrows into StButtons

Browse Source 
Make the next and previous page arrows be StButtons, with their
'icon-name' property matching the current StIcon icon name, and
use the 'clicked' signal to switch pages.

Remove the 'button-press' callback the scroll view, since the
buttons take over this functionality.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2335>
This commit is contained in:
Georges Basile Stavracas Neto 2022-06-28 12:39:50 -03:00 committed by Marge Bot
parent f22a5c5a91
commit 892fa6581c
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/theme/gnome-shell-sass/widgets/_app-grid.scss
View File

@ -146,7 +146,7 @@ $app_icon_size: 96px;
} }
} }
.page-navigation-arrow { .page-navigation-arrow > StIcon {
margin: 6px; margin: 6px;
width: 24px; width: 24px;
height: 24px; height: 24px;

38
js/ui/appDisplay.js
View File

@ -520,7 +520,6 @@ var BaseAppView = GObject.registerClass({
this._canScroll = true; // limiting scrolling speed this._canScroll = true; // limiting scrolling speed
this._scrollTimeoutId = 0; this._scrollTimeoutId = 0;
this._scrollView.connect('scroll-event', this._onScroll.bind(this)); this._scrollView.connect('scroll-event', this._onScroll.bind(this));
this._scrollView.connect('button-press-event', this._onButtonPress.bind(this));
this._scrollView.add_actor(this._grid); this._scrollView.add_actor(this._grid);
@ -569,26 +568,27 @@ var BaseAppView = GObject.registerClass({
// Next/prev page arrows // Next/prev page arrows
const rtl = this.get_text_direction() === Clutter.TextDirection.RTL; const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
this._nextPageArrow = new St.Icon({ this._nextPageArrow = new St.Button({
style_class: 'page-navigation-arrow', style_class: 'page-navigation-arrow',
icon_name: rtl icon_name: rtl
? 'carousel-arrow-previous-symbolic' ? 'carousel-arrow-previous-symbolic'
: 'carousel-arrow-next-symbolic', : 'carousel-arrow-next-symbolic',
reactive: false,
x_expand: true, x_expand: true,
x_align: Clutter.ActorAlign.CENTER,
}); });
this._prevPageArrow = new St.Icon({ this._nextPageArrow.connect('clicked',
() => this.goToPage(this._grid.currentPage + 1));
this._prevPageArrow = new St.Button({
style_class: 'page-navigation-arrow', style_class: 'page-navigation-arrow',
icon_name: rtl icon_name: rtl
? 'carousel-arrow-next-symbolic' ? 'carousel-arrow-next-symbolic'
: 'carousel-arrow-previous-symbolic', : 'carousel-arrow-previous-symbolic',
opacity: 0, opacity: 0,
reactive: false,
visible: false, visible: false,
x_expand: true, x_expand: true,
x_align: Clutter.ActorAlign.CENTER,
}); });
this._prevPageArrow.connect('clicked',
() => this.goToPage(this._grid.currentPage - 1));
const scrollContainer = new St.Widget({ const scrollContainer = new St.Widget({
clip_to_allocation: true, clip_to_allocation: true,
@ -717,30 +717,6 @@ var BaseAppView = GObject.registerClass({
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} }
_pageForCoords(x, y) {
const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
const {pagePadding} = this._grid.layoutManager;
const [success, pointerX] = this._scrollView.transform_stage_point(x, y);
if (!success)
return SidePages.NONE;
if (pointerX < pagePadding.left)
return rtl ? SidePages.NEXT : SidePages.PREVIOUS;
else if (pointerX > this._scrollView.width - pagePadding.right)
return rtl ? SidePages.PREVIOUS : SidePages.NEXT;
return SidePages.NONE;
}
_onButtonPress(actor, event) {
const page = this._pageForCoords(...event.get_coords());
if (page === SidePages.NEXT)
this.goToPage(this._grid.currentPage + 1);
else if (page === SidePages.PREVIOUS)
this.goToPage(this._grid.currentPage - 1);
}
_swipeBegin(tracker, monitor) { _swipeBegin(tracker, monitor) {
if (monitor !== Main.layoutManager.primaryIndex) if (monitor !== Main.layoutManager.primaryIndex)
return; return;