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

workspaceThumbnail: Allocate final thumbnail sizes

Browse Source 
ThumbnailsBox currently allocates each workspace thumbnail using their
porthole size, and scales them down using scale-x and scale-y. This is
slightly problematic since it doesn't allow for properly styling these
thumbnails through CSS.

Rework ThumbnailsBox to allocate workspace thumbnails at their actual
sizes, and scale down the '_contents' actor inside WorkspaceThumbnail.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1593>
This commit is contained in:
Georges Basile Stavracas Neto 2021-01-25 20:59:46 -03:00 committed by Marge Bot
parent 3ad7b85e25
commit 9980c80619
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/ui/workspaceThumbnail.js
View File

@ -318,8 +318,7 @@ var WorkspaceThumbnail = GObject.registerClass({
} }
setPorthole(x, y, width, height) { setPorthole(x, y, width, height) {
this.set_size(width, height); this._contents.set_size(width, height);
this._contents.set_position(-x, -y);
} }
_lookupIndex(metaWindow) { _lookupIndex(metaWindow) {
@ -611,6 +610,10 @@ var WorkspaceThumbnail = GObject.registerClass({
return false; return false;
} }
setScale(scale) {
this._contents.set_scale(scale, scale);
}
}); });
@ -727,10 +730,7 @@ var ThumbnailsBox = GObject.registerClass({
_activateThumbnailAtPoint(stageX, stageY, time) { _activateThumbnailAtPoint(stageX, stageY, time) {
const [r_, x] = this.transform_stage_point(stageX, stageY); const [r_, x] = this.transform_stage_point(stageX, stageY);
const thumbnail = this._thumbnails.find(t => { const thumbnail = this._thumbnails.find(t => x >= t.x && x <= t.x + t.width);
const [w] = t.get_transformed_size();
return x >= t.x && x <= t.x + w;
});
if (thumbnail) if (thumbnail)
thumbnail.activate(time); thumbnail.activate(time);
} }
@ -801,8 +801,7 @@ var ThumbnailsBox = GObject.registerClass({
let targetX2; let targetX2;
if (rtl) { if (rtl) {
const [r_, w] = workspace.get_transformed_size(); const baseX = workspace.x + workspace.width;
const baseX = workspace.x + w;
targetX1 = baseX - WORKSPACE_CUT_SIZE; targetX1 = baseX - WORKSPACE_CUT_SIZE;
targetX2 = baseX + spacing + WORKSPACE_CUT_SIZE; targetX2 = baseX + spacing + WORKSPACE_CUT_SIZE;
} else { } else {
@ -1358,15 +1357,15 @@ var ThumbnailsBox = GObject.registerClass({
// of the actor, but x2/y2 are increased by the *unscaled* size. // of the actor, but x2/y2 are increased by the *unscaled* size.
if (rtl) { if (rtl) {
childBox.x2 = box.x2 - x1; childBox.x2 = box.x2 - x1;
childBox.x1 = box.x2 - (x1 + portholeWidth); childBox.x1 = box.x2 - (x1 + thumbnailWidth);
} else { } else {
childBox.x1 = x1; childBox.x1 = x1;
childBox.x2 = x1 + portholeWidth; childBox.x2 = x1 + thumbnailWidth;
} }
childBox.y1 = y1; childBox.y1 = y1;
childBox.y2 = y1 + portholeHeight; childBox.y2 = y1 + thumbnailHeight;
thumbnail.set_scale(roundedHScale, roundedVScale); thumbnail.setScale(roundedHScale, roundedVScale);
thumbnail.allocate(childBox); thumbnail.allocate(childBox);
if (i === indicatorUpperWs) { if (i === indicatorUpperWs) {