levnikmyskin/hyprland-virtual-desktops
1
1
Fork 0
mirror of https://github.com/levnikmyskin/hyprland-virtual-desktops.git synced 2024-10-05 14:58:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't create/replace vdesk if it already exists

Browse Source
This commit is contained in:
Alessio Molinari 2024-02-24 10:50:53 +01:00
parent 5460d5e129
commit b892c0f88b
No known key found for this signature in database
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/VirtualDeskManager.hpp
View File

@ -32,9 +32,10 @@ class VirtualDeskManager {
int getDeskIdFromName(const std::string& name, bool createIfNotFound = true);
private:
int m_activeDeskKey = 1;
bool confLoaded = false;
void cycleWorkspaces();
CMonitor* getCurrentMonitor();
int m_activeDeskKey = 1;
bool confLoaded = false;
void cycleWorkspaces();
CMonitor* getCurrentMonitor();
std::shared_ptr<VirtualDesk> getOrCreateVdesk(int vdeskId);
};
#endif

41
src/VirtualDeskManager.cpp
View File

@ -4,9 +4,8 @@
#include <ranges>
VirtualDeskManager::VirtualDeskManager() {
this->conf = RememberLayoutConf::size;
vdeskNamesMap[1] = "1";
vdesksMap[1] = std::make_shared<VirtualDesk>();
this->conf = RememberLayoutConf::size;
getOrCreateVdesk(1);
}
const std::shared_ptr<VirtualDesk>& VirtualDeskManager::activeVdesk() {
@ -28,13 +27,7 @@ void VirtualDeskManager::changeActiveDesk(int vdeskId, bool apply) {
return;
}
if (!vdesksMap.contains(vdeskId)) {
if (isVerbose())
printLog("creating new vdesk with id " + std::to_string(vdeskId));
if (!vdeskNamesMap.contains(vdeskId))
vdeskNamesMap[vdeskId] = std::to_string(vdeskId);
vdesksMap[vdeskId] = std::make_shared<VirtualDesk>(vdeskId, vdeskNamesMap[vdeskId]);
}
getOrCreateVdesk(vdeskId);
lastDesk = activeVdesk()->id;
m_activeDeskKey = vdeskId;
if (apply)
@ -64,9 +57,9 @@ void VirtualDeskManager::applyCurrentVDesk() {
}
if (isVerbose())
printLog("applying vdesk" + activeVdesk()->name);
auto currentMonitor = getCurrentMonitor();
auto layout = activeVdesk()->activeLayout(conf);
CWorkspace* focusedWorkspace;
auto currentMonitor = getCurrentMonitor();
auto layout = activeVdesk()->activeLayout(conf);
CWorkspace* focusedWorkspace = nullptr;
for (auto [lmon, workspaceId] : layout) {
CMonitor* mon = g_pCompositor->getMonitorFromID(lmon->ID);
if (!lmon || !lmon->m_bEnabled) {
@ -95,7 +88,7 @@ void VirtualDeskManager::applyCurrentVDesk() {
}
mon->changeWorkspace(workspace, false);
}
if (currentMonitor)
if (currentMonitor && focusedWorkspace)
currentMonitor->changeWorkspace(focusedWorkspace, false);
}
@ -118,10 +111,8 @@ int VirtualDeskManager::moveToDesk(std::string& arg, int vdeskId) {
if (isVerbose())
printLog("creating new vdesk with id " + std::to_string(vdeskId));
if (!vdeskNamesMap.contains(vdeskId))
vdeskNamesMap[vdeskId] = std::to_string(vdeskId);
auto vdesk = vdesksMap[vdeskId] = std::make_shared<VirtualDesk>(vdeskId, vdeskNamesMap[vdeskId]);
auto vdesk = getOrCreateVdesk(vdeskId);
// just take the first workspace wherever in the layout
auto wid = vdesk->activeLayout(conf).begin()->second;
@ -151,8 +142,8 @@ int VirtualDeskManager::getDeskIdFromName(const std::string& name, bool createIf
max_key = key;
}
if (!found && createIfNotFound) {
vdesk = max_key + 1;
vdeskNamesMap[vdesk] = name;
vdesk = max_key + 1;
getOrCreateVdesk(vdesk);
}
return vdesk;
}
@ -258,6 +249,18 @@ int VirtualDeskManager::nextDeskId(bool cycle) {
return nextId;
}
std::shared_ptr<VirtualDesk> VirtualDeskManager::getOrCreateVdesk(int vdeskId) {
if (!vdeskNamesMap.contains(vdeskId))
vdeskNamesMap[vdeskId] = std::to_string(vdeskId);
if (!vdesksMap.contains(vdeskId)) {
if (isVerbose())
printLog("creating new vdesk with id " + std::to_string(vdeskId));
auto vdesk = vdesksMap[vdeskId] = std::make_shared<VirtualDesk>(vdeskId, vdeskNamesMap[vdeskId]);
return vdesk;
}
return vdesksMap[vdeskId];
}
void VirtualDeskManager::invalidateAllLayouts() {
for (const auto& [_, vdesk] : vdesksMap) {
vdesk->invalidateActiveLayout();

3
src/utils.cpp
View File

@ -52,6 +52,9 @@ RememberLayoutConf layoutConfFromString(const std::string& conf) {
bool isVerbose() {
static auto* const PVERBOSELOGS = &HyprlandAPI::getConfigValue(PHANDLE, VERBOSE_LOGS)->intValue;
// this might happen if called before plugin is initalized
if (!PVERBOSELOGS)
return true;
return *PVERBOSELOGS;
}