workspaceThumbnail: Don't rely on allocation to compute scale

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>
(cherry picked from commit 2694a64ebb)
This commit is contained in:
Florian Müllner 2024-05-20 20:22:11 +02:00
parent 6f4529e44d
commit 67a6c13d92
No known key found for this signature in database

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) {