From 43402f85ff1424aa7bd93d916c82cf781f9074cd Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Fri, 22 Sep 2023 01:21:24 -0700 Subject: [PATCH] Fix build again --- flake.lock | 14 +++++++------- src/Hy3Layout.cpp | 4 ++-- src/Hy3Node.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 6758abc..1a059e0 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1695237968, - "narHash": "sha256-n0K0iiXCdbw3l5+YTMb7ESJQXnXYoVUIzeTbHo5D1rE=", + "lastModified": 1695339720, + "narHash": "sha256-1Dy/2NK3M882g2iXhcrUeC0khi0LeHieTpnOI7yyYwk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1925e64c21811ce76e5059d7a063f968c2d3e98c", + "rev": "1357b66091ecd73f097d19d527a23a9ae72a4ff1", "type": "github" }, "original": { @@ -87,18 +87,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1694302348, - "narHash": "sha256-S9NOc88L/1jpNKJqBu2Hihvn0V1HHCK2hXE4bNBAStg=", + "lastModified": 1695277534, + "narHash": "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=", "owner": "wlroots", "repo": "wlroots", - "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", + "rev": "98a745d926d8048bc30aef11b421df207a01c279", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211", + "rev": "98a745d926d8048bc30aef11b421df207a01c279", "type": "gitlab" } }, diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp index 48fd42a..6afa1b1 100644 --- a/src/Hy3Layout.cpp +++ b/src/Hy3Layout.cpp @@ -644,7 +644,7 @@ void Hy3Layout::fullscreenRequestForWindow( g_pCompositor->updateWindowAnimatedDecorationValues(window); g_pXWaylandManager->setWindowSize(window, window->m_vRealSize.goalv()); - g_pCompositor->moveWindowToTop(window); + g_pCompositor->changeWindowZOrder(window, true); this->recalculateMonitor(monitor->ID); } @@ -1246,7 +1246,7 @@ unfullscreen: fsupdate: g_pCompositor->updateWindowAnimatedDecorationValues(window); g_pXWaylandManager->setWindowSize(window, window->m_vRealSize.goalv()); - g_pCompositor->moveWindowToTop(window); + g_pCompositor->changeWindowZOrder(window, true); this->recalculateMonitor(monitor->ID); } diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp index 52912d2..9ed6add 100644 --- a/src/Hy3Node.cpp +++ b/src/Hy3Node.cpp @@ -212,7 +212,7 @@ void Hy3Node::markFocused() { void Hy3Node::raiseToTop() { switch (this->data.type) { - case Hy3NodeType::Window: g_pCompositor->moveWindowToTop(this->data.as_window); break; + case Hy3NodeType::Window: g_pCompositor->changeWindowZOrder(this->data.as_window, true); break; case Hy3NodeType::Group: for (auto* child: this->data.as_group.children) { child->raiseToTop();