Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-16 03:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from Dridus/rmm/special-workspace-support

Browse source 
Rmm/special workspace support
This commit is contained in:
Kaley Fischer 2024-03-05 08:45:09 +01:00 • committed by GitHub
commit 7e6a8fc6a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

4
src/Hy3Layout.cpp
View file

@ -1875,7 +1875,9 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool no_animation) {
break;
}
}
} else {
}
if (monitor == nullptr) {
monitor = g_pCompositor->getMonitorFromID(
g_pCompositor->getWorkspaceByID(node->workspace_id)->m_iMonitorID
);

3
src/dispatchers.cpp
View file

@ -10,7 +10,8 @@ int workspace_for_action(bool allow_fullscreen = false) {
if (g_pLayoutManager->getCurrentLayout() != g_Hy3Layout.get()) return -1;
if (!g_pCompositor->m_pLastMonitor) return -1;
int workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
int workspace_id = g_pCompositor->m_pLastMonitor->specialWorkspaceID;
if (workspace_id == 0) workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
if (workspace_id == -1) return -1;
auto* workspace = g_pCompositor->getWorkspaceByID(workspace_id);