Skip to content

Commit

Permalink
wlr-foreign-toplevel: fix fullscreen failing and add output support (#…
Browse files Browse the repository at this point in the history
…6360)

* wlr-foreign-toplevel: fix fullscreen failing and add output support

* fix for core protocol rewrite
  • Loading branch information
outfoxxed committed Jun 10, 2024
1 parent b16af45 commit 89a3c90
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions src/protocols/ForeignToplevelWlr.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "ForeignToplevelWlr.hpp"
#include <algorithm>
#include "../Compositor.hpp"
#include "protocols/core/Output.hpp"
#include "render/Renderer.hpp"

#define LOGM PROTO::foreignToplevelWlr->protoLog

Expand Down Expand Up @@ -36,7 +38,21 @@ CForeignToplevelHandleWlr::CForeignToplevelHandleWlr(SP<CZwlrForeignToplevelHand
return;
}

g_pCompositor->setWindowFullscreen(PWINDOW, true);
if (output) {
const auto wpMonitor = CWLOutputResource::fromResource(output)->monitor;

if (!wpMonitor.expired()) {
const auto monitor = wpMonitor.lock();

if (PWINDOW->m_pWorkspace != monitor->activeWorkspace) {
g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, monitor->activeWorkspace);
g_pCompositor->setActiveMonitor(monitor.get());
}
}
}

g_pCompositor->setWindowFullscreen(PWINDOW, true, FULLSCREEN_FULL);
g_pHyprRenderer->damageWindow(PWINDOW);
});

resource->setUnsetFullscreen([this](CZwlrForeignToplevelHandleV1* p) {
Expand Down Expand Up @@ -372,4 +388,4 @@ PHLWINDOW CForeignToplevelWlrProtocol::windowFromHandleResource(wl_resource* res
}

return nullptr;
}
}

0 comments on commit 89a3c90

Please sign in to comment.