Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-25 15:34:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust to merge

Browse Source
This commit is contained in:
WarmUpTill 2021-06-06 19:23:09 +02:00
parent d66a2dc408
commit 7d381b9ba1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/headers/macro-condition-virt-desktop.hpp
View File

@ -8,7 +8,7 @@ public:
bool CheckCondition(); bool CheckCondition();
bool Save(obs_data_t *obj); bool Save(obs_data_t *obj);
bool Load(obs_data_t *obj); bool Load(obs_data_t *obj);
int GetId() { return id; }; std::string GetId() { return id; };
static std::shared_ptr<MacroCondition> Create() static std::shared_ptr<MacroCondition> Create()
{ {
return std::make_shared<MacroConditionVirtDesktop>(); return std::make_shared<MacroConditionVirtDesktop>();
@ -17,7 +17,7 @@ public:
private: private:
static bool _registered; static bool _registered;
static const int id; static const std::string id;
}; };
class MacroConditionVirtDesktopEdit : public QWidget { class MacroConditionVirtDesktopEdit : public QWidget {

2
src/headers/platform-funcs.hpp
View File

@ -9,3 +9,5 @@ std::pair<int, int> getCursorPos();
int secondsSinceLastInput(); int secondsSinceLastInput();
void GetProcessList(QStringList &processes); void GetProcessList(QStringList &processes);
bool isInFocus(const QString &executable); bool isInFocus(const QString &executable);
bool GetCurrentVirtualDesktop(long &desktop);
bool GetVirtualDesktopCount(long &ndesktops);

2
src/macro-condition-virt-desktop.cpp
View File

@ -3,7 +3,7 @@
#include "headers/utility.hpp" #include "headers/utility.hpp"
#include "headers/advanced-scene-switcher.hpp" #include "headers/advanced-scene-switcher.hpp"
const int MacroConditionVirtDesktop::id = 12; const std::string MacroConditionVirtDesktop::id = "virtual_desktop";
bool MacroConditionVirtDesktop::_registered = MacroConditionFactory::Register( bool MacroConditionVirtDesktop::_registered = MacroConditionFactory::Register(
MacroConditionVirtDesktop::id, MacroConditionVirtDesktop::id,