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

workspaceThumbnail: Don't rely on allocation to compute scale

Browse Source 
We currently compute the target scale from the allocated height,
which means that it only becomes available after thumbnails have
been allocated at least once at their expanded height.

As the minimap is initially hidden, this only happens after it is
expanded for the first time, which means the corresponding transition
is not animated.

In order to allow for a fix, compute the target height ourselves
to allow the scale computation to work independently from the
expand factor.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3331>
This commit is contained in:
Florian Müllner 2024-05-20 20:22:11 +02:00 committed by Marge Bot
parent e7dc0de75e
commit 2694a64ebb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/workspaceThumbnail.js
View File

@ -1267,11 +1267,18 @@ export const ThumbnailsBox = GObject.registerClass({
// Compute the scale we'll need once everything is updated,
// unless we are currently transitioning
if (this._expandFraction === 1) {
const [, natWidth] = this.get_preferred_width(-1);
const [, natHeight] = this.get_preferred_height(natWidth);
const totalSpacing = (nWorkspaces - 1) * spacing;
const availableWidth = (box.get_width() - totalSpacing) / nWorkspaces;
const availableHeight =
Math.min(natHeight, portholeHeight * this.maxThumbnailScale) -
themeNode.get_vertical_padding() -
themeNode.get_border_width(St.Side.TOP) -
themeNode.get_border_width(St.Side.BOTTOM);
const hScale = availableWidth / portholeWidth;
const vScale = box.get_height() / portholeHeight;
const vScale = availableHeight / portholeHeight;
const newScale = Math.min(hScale, vScale);
if (newScale !== this._targetScale) {