Skip to content

Update Forge GNOME extension fork to main #518

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

Closed
Cartoone9 wants to merge 1 commit into from
+31 −8
Closed

Update Forge GNOME extension fork to main #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 31 additions & 8 deletions lib/extension/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ export class WindowManager extends GObject.Object {
}

hideWindowBorders() {
this.tree.nodeWindows.forEach((nodeWindow) => {
this.allNodeWindows.forEach((nodeWindow) => {
let actor = nodeWindow.windowActor;
if (actor) {
this.hideActorBorder(actor);
Expand Down Expand Up @@ -1238,8 +1238,7 @@ export class WindowManager extends GObject.Object {
return firstMonWs === secondMonWs;
}

showWindowBorders() {
let metaWindow = this.focusMetaWindow;
showWindowBordersFor(metaWindow) {
if (!metaWindow) return;
let windowActor = metaWindow.get_compositor_private();
if (!windowActor) return;
Expand Down Expand Up @@ -1333,7 +1332,7 @@ export class WindowManager extends GObject.Object {
focusBorderEnabled &&
tilingModeEnabled &&
!nodeWindow.isFloat() &&
!maximized &&
!maximized() &&
parentNode.childNodes.length === 1 &&
(parentNode.isCon() || parentNode.isMonitor()) &&
!(parentNode.isTabbed() || parentNode.isStacked())
Expand Down Expand Up @@ -1361,21 +1360,45 @@ export class WindowManager extends GObject.Object {
borders.forEach((border) => {
border.set_size(rect.width + inset * 2, rect.height + inset * 2);
border.set_position(rect.x - inset, rect.y - inset);
if (metaWindow.appears_focused && !metaWindow.minimized) {
border.show();

// show for both focused + unfocused
if (!metaWindow.minimized) border.show();

// mark unfocused borders for CSS
if (!metaWindow.appears_focused) {
border.add_style_class_name("window-unfocused");
} else {
border.remove_style_class_name("window-unfocused");
}

if (global.window_group && global.window_group.contains(border)) {
// TODO - sort the borders with split border being on top
global.window_group.remove_child(border);
// Add the border just above the focused window
// Add the border just above its own window
global.window_group.insert_child_above(border, metaWindow.get_compositor_private());
}
});
}

updateBorderLayout() {
this.hideWindowBorders();
this.showWindowBorders();

const activeWs = global.workspace_manager.get_active_workspace();

for (const nodeWindow of this.allNodeWindows) {
const w = nodeWindow.nodeValue;
if (!w) continue;
if (w.minimized) continue;

// Only draw borders for windows that belong to the active workspace,
// unless they are on all workspaces.
if (!w.is_on_all_workspaces() && w.get_workspace() !== activeWs) continue;

// Extra safety: some windows report false here while switching workspaces
if (!w.showing_on_its_workspace()) continue;

this.showWindowBordersFor(w);
}
}

calculateGaps(node) {
Expand Down