Skip to content

Commit

Permalink
Merge branch 'develop' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
jtaala committed Jun 14, 2024
2 parents 43f0339 + 78da250 commit 2ab1d62
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "https://github.com/paperwm/PaperWM",
"settings-schema": "org.gnome.shell.extensions.paperwm",
"shell-version": [ "45", "46" ],
"version-name": "46.11.1",
"version-name": "46.11.2",
"donations": {
"buymeacoffee": "jaytaala",
"patreon": "valpackett"
Expand Down
22 changes: 19 additions & 3 deletions tiling.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ export class Space extends Array {
style_class: 'paperwm-selection tile-preview',
});
this.selection = selection;
// initial state is shown (unless border-size is 0)
if (Settings.prefs.selection_border_size <= 0) {
this.hideSelection();
}

clip.space = this;
cloneContainer.space = this;
Expand Down Expand Up @@ -2019,8 +2023,6 @@ border-radius: ${borderWidth}px;

destroy() {
this.getWindows().forEach(w => {


removePaperWMFlags(w);
});
this.signals.destroy();
Expand Down Expand Up @@ -3367,6 +3369,16 @@ export function registerWindow(metaWindow) {
showHandler(actor);
});

/**
* Ensures when moving window that it's targetHeight is met.
*/
signals.connect(actor, 'stage-views-changed', _actor => {
const f = metaWindow.get_frame_rect();
if (metaWindow._targetHeight !== f.height) {
resizeHandler(metaWindow);
}
});

signals.connect(actor, 'destroy', destroyHandler);

return true;
Expand Down Expand Up @@ -3474,11 +3486,15 @@ export function resizeHandler(metaWindow) {
if (inGrab && inGrab.window === metaWindow)
return;

const space = spaces.spaceOfWindow(metaWindow);
if (!space) {
return;
}

const f = metaWindow.get_frame_rect();
metaWindow._targetWidth = null;
metaWindow._targetHeight = null;

const space = spaces.spaceOfWindow(metaWindow);
if (space.indexOf(metaWindow) === -1) {
nonTiledSizeHandler(metaWindow);
return;
Expand Down

0 comments on commit 2ab1d62

Please sign in to comment.