Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gwl: Fix thumbnails resize on scaled monitors #12203

Merged
merged 2 commits into from
May 30, 2024
Merged

gwl: Fix thumbnails resize on scaled monitors #12203

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0074e4f
gwl: Fix thumbnails resize on scaled monitors
anaximeno May 20, 2024
41c378b
gwl: Update conditions to set a zero sized height to the thumbnail actor
anaximeno May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions files/usr/share/cinnamon/applets/grouped-window-list@cinnamon.org/menus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,13 @@ class WindowThumbnail {
this.signals.disconnect("notify::minimized", this.metaWindow);
}

calcThumbsFullSize(singleThumbSize) {
const padding = this.thumbnailActor.style_length('padding');
const margin = this.thumbnailActor.style_length('margin');
const size = (singleThumbSize + this.thumbnailPadding) * global.ui_scale;
return (size + padding + margin) * this.groupState.windowCount;
}

refreshThumbnail() {
if (this.willUnmount
|| !this.groupState
Expand Down Expand Up @@ -793,16 +800,15 @@ class WindowThumbnail {
thumbnailSize = thumbnailWidth;
}

const padding = this.thumbnailActor.style_length('padding');
const margin = this.thumbnailActor.style_length('margin');

let i = 0;
while (((thumbnailSize + this.thumbnailPadding + padding + margin) * this.groupState.windowCount > monitorSize)
&& thumbnailWidth > 64
&& thumbnailHeight > 64) {
while (this.calcThumbsFullSize(thumbnailSize) > monitorSize &&
thumbnailWidth > 64 && thumbnailHeight > 64) {
// ---
thumbnailWidth -= 1;
thumbnailHeight -= 1;
thumbnailSize -= 1;

i++;
// Bail after 200 iterations
if (i > 200) {
Expand All @@ -812,18 +818,19 @@ class WindowThumbnail {

// If we can't fit all the thumbnails, revert to a vertical menu orientation
// with no thumbnails, which can hold more window selections.
const verticalThumbs = ((thumbnailSize + this.thumbnailPadding + padding + margin) * this.groupState.windowCount) > monitorSize;
const verticalThumbs = this.calcThumbsFullSize(thumbnailSize) > monitorSize;
const currentVerticalThumbsState = this.groupState.verticalThumbs;
this.groupState.set({verticalThumbs});

if (verticalThumbs !== currentVerticalThumbsState) return;

const scaledWidth = thumbnailWidth * global.ui_scale;
this.thumbnailActor.width = scaledWidth;
this.thumbnailActor.width = thumbnailWidth * global.ui_scale;
this.container.style = `width: ${Math.floor(thumbnailWidth - 16)}px;`;
if (this.groupState.verticalThumbs || (this.state.settings.verticalThumbs && this.state.settings.showThumbs)) {
this.thumbnailActor.height = thumbnailHeight;
} else if (this.state.settings.verticalThumbs) {

if (this.state.settings.verticalThumbs && !this.groupState.verticalThumbs && !this.state.settings.showThumbs) {
this.thumbnailActor.height = 0;
} else {
this.thumbnailActor.height = thumbnailHeight * global.ui_scale;
}

this.labelContainer.child.text = this.metaWindow.title || '';
Expand Down
Loading