smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix settings modifiers initilization, move initization to header

Browse source 
fixes: #8587
This commit is contained in:
sithlord48 2025-05-14 16:00:22 -04:00 committed by Nick Bolton
parent 332e6c4a4d
commit 393a006773
3 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib/gui/config/Screen.cpp
View file

@ -15,20 +15,9 @@ using enum ScreenConfig::Fix;
Screen::Screen(const QString &name) Screen::Screen(const QString &name)
{ {
init();
setName(name); setName(name);
} }
void Screen::init()
{
m_Name.clear();
m_Aliases.clear();
m_SwitchCornerSize = 0;
m_Modifiers.fill(0, static_cast<int>(NumModifiers));
m_SwitchCorners.fill(false, static_cast<int>(NumSwitchCorners));
m_Fixes.fill(false, static_cast<int>(NumFixes));
}
void Screen::loadSettings(QSettingsProxy &settings) void Screen::loadSettings(QSettingsProxy &settings)
{ {
setName(settings.value("name").toString()); setName(settings.value("name").toString());

12
src/lib/gui/config/Screen.h
View file

@ -115,8 +115,6 @@ public:
bool operator==(const Screen &screen) const; bool operator==(const Screen &screen) const;
protected: protected:
void init();
QStringList &aliases() QStringList &aliases()
{ {
return m_Aliases; return m_Aliases;
@ -160,12 +158,12 @@ protected:
private: private:
QPixmap m_Pixmap = QIcon::fromTheme("video-display").pixmap(QSize(96, 96)); QPixmap m_Pixmap = QIcon::fromTheme("video-display").pixmap(QSize(96, 96));
QString m_Name; QString m_Name = {};
QStringList m_Aliases; QStringList m_Aliases = {};
QList<int> m_Modifiers; QList<int> m_Modifiers = {0, 1, 2, 3, 4, 5};
QList<bool> m_SwitchCorners; QList<bool> m_SwitchCorners = {false, false, false, false};
int m_SwitchCornerSize = 0; int m_SwitchCornerSize = 0;
QList<bool> m_Fixes; QList<bool> m_Fixes{false, false, false, false};
bool m_Swapped = false; bool m_Swapped = false;
bool m_isServer = false; bool m_isServer = false;
}; };

2
src/lib/gui/dialogs/ScreenSettingsDialog.cpp
View file

@ -79,8 +79,6 @@ void ScreenSettingsDialog::accept()
return; return;
} }
m_pScreen->init();
m_pScreen->setName(ui_->m_pLineEditName->text()); m_pScreen->setName(ui_->m_pLineEditName->text());
for (int i = 0; i < ui_->m_pListAliases->count(); i++) { for (int i = 0; i < ui_->m_pListAliases->count(); i++) {