From 7d381b9ba1e27bcf6bbdfd90dfb26bde0a7483ec Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 6 Jun 2021 19:23:09 +0200 Subject: [PATCH] Adjust to merge --- src/headers/macro-condition-virt-desktop.hpp | 4 ++-- src/headers/platform-funcs.hpp | 2 ++ src/macro-condition-virt-desktop.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/headers/macro-condition-virt-desktop.hpp b/src/headers/macro-condition-virt-desktop.hpp index 1e019299..c9ceca47 100644 --- a/src/headers/macro-condition-virt-desktop.hpp +++ b/src/headers/macro-condition-virt-desktop.hpp @@ -8,7 +8,7 @@ public: bool CheckCondition(); bool Save(obs_data_t *obj); bool Load(obs_data_t *obj); - int GetId() { return id; }; + std::string GetId() { return id; }; static std::shared_ptr Create() { return std::make_shared(); @@ -17,7 +17,7 @@ public: private: static bool _registered; - static const int id; + static const std::string id; }; class MacroConditionVirtDesktopEdit : public QWidget { diff --git a/src/headers/platform-funcs.hpp b/src/headers/platform-funcs.hpp index d6164901..ed621f7a 100644 --- a/src/headers/platform-funcs.hpp +++ b/src/headers/platform-funcs.hpp @@ -9,3 +9,5 @@ std::pair getCursorPos(); int secondsSinceLastInput(); void GetProcessList(QStringList &processes); bool isInFocus(const QString &executable); +bool GetCurrentVirtualDesktop(long &desktop); +bool GetVirtualDesktopCount(long &ndesktops); diff --git a/src/macro-condition-virt-desktop.cpp b/src/macro-condition-virt-desktop.cpp index 9f02f1b5..1c0a0d60 100644 --- a/src/macro-condition-virt-desktop.cpp +++ b/src/macro-condition-virt-desktop.cpp @@ -3,7 +3,7 @@ #include "headers/utility.hpp" #include "headers/advanced-scene-switcher.hpp" -const int MacroConditionVirtDesktop::id = 12; +const std::string MacroConditionVirtDesktop::id = "virtual_desktop"; bool MacroConditionVirtDesktop::_registered = MacroConditionFactory::Register( MacroConditionVirtDesktop::id,