diff --git a/app/data/preferencesdata.cpp b/app/data/preferencesdata.cpp
index 43d8fd730..b550ddbab 100644
--- a/app/data/preferencesdata.cpp
+++ b/app/data/preferencesdata.cpp
@@ -30,7 +30,6 @@ const bool Preferences::BORDERLESSMAXIMIZED;
const bool Preferences::METAPRESSFORAPPLAUNCHER;
const bool Preferences::METAHOLDFORBADGES;
const int Preferences::SCREENSDELAY;
-const int Preferences::OUTLINEWIDTH;
const Settings::MouseSensitivity Preferences::MOUSESENSITIVITY;
Preferences::Preferences()
@@ -45,8 +44,7 @@ Preferences::Preferences(Preferences &&o)
metaPressForAppLauncher(o.metaPressForAppLauncher),
metaHoldForBadges(o.metaHoldForBadges),
mouseSensitivity(o.mouseSensitivity),
- screensDelay(o.screensDelay),
- outlineWidth(o.outlineWidth)
+ screensDelay(o.screensDelay)
{
}
@@ -58,8 +56,7 @@ Preferences::Preferences(const Preferences &o)
metaPressForAppLauncher(o.metaPressForAppLauncher),
metaHoldForBadges(o.metaHoldForBadges),
mouseSensitivity(o.mouseSensitivity),
- screensDelay(o.screensDelay),
- outlineWidth(o.outlineWidth)
+ screensDelay(o.screensDelay)
{
}
@@ -73,7 +70,6 @@ Preferences &Preferences::operator=(const Preferences &rhs)
metaHoldForBadges = rhs.metaHoldForBadges;
mouseSensitivity = rhs.mouseSensitivity;
screensDelay = rhs.screensDelay;
- outlineWidth = rhs.outlineWidth;
return (*this);
}
@@ -88,7 +84,6 @@ Preferences &Preferences::operator=(Preferences &&rhs)
metaHoldForBadges = rhs.metaHoldForBadges;
mouseSensitivity = rhs.mouseSensitivity;
screensDelay = rhs.screensDelay;
- outlineWidth = rhs.outlineWidth;
return (*this);
}
@@ -102,8 +97,7 @@ bool Preferences::operator==(const Preferences &rhs) const
&& (metaPressForAppLauncher == rhs.metaPressForAppLauncher)
&& (metaHoldForBadges == rhs.metaHoldForBadges)
&& (mouseSensitivity == rhs.mouseSensitivity)
- && (screensDelay == rhs.screensDelay)
- && (outlineWidth == rhs.outlineWidth);
+ && (screensDelay == rhs.screensDelay);
}
bool Preferences::operator!=(const Preferences &rhs) const
@@ -120,8 +114,7 @@ bool Preferences::inDefaultValues() const
&& (metaPressForAppLauncher == METAPRESSFORAPPLAUNCHER)
&& (metaHoldForBadges == METAHOLDFORBADGES)
&& (mouseSensitivity == MOUSESENSITIVITY)
- && (screensDelay == SCREENSDELAY)
- && (outlineWidth == OUTLINEWIDTH);
+ && (screensDelay == SCREENSDELAY);
}
void Preferences::setToDefaults()
@@ -134,7 +127,6 @@ void Preferences::setToDefaults()
metaHoldForBadges = METAHOLDFORBADGES;
mouseSensitivity = MOUSESENSITIVITY;
screensDelay = SCREENSDELAY;
- outlineWidth = OUTLINEWIDTH;
}
diff --git a/app/data/preferencesdata.h b/app/data/preferencesdata.h
index 6c8ae5ce3..295527b93 100644
--- a/app/data/preferencesdata.h
+++ b/app/data/preferencesdata.h
@@ -37,7 +37,6 @@ public:
static const bool METAPRESSFORAPPLAUNCHER = false;
static const bool METAHOLDFORBADGES = true;
static const int SCREENSDELAY = 2500;
- static const int OUTLINEWIDTH = 1;
static const Settings::MouseSensitivity MOUSESENSITIVITY = Settings::HighMouseSensitivity;
Preferences();
@@ -52,7 +51,6 @@ public:
bool metaPressForAppLauncher{METAPRESSFORAPPLAUNCHER};
bool metaHoldForBadges{METAHOLDFORBADGES};
int screensDelay{SCREENSDELAY};
- int outlineWidth{OUTLINEWIDTH};
Settings::MouseSensitivity mouseSensitivity{MOUSESENSITIVITY};
bool inDefaultValues() const;
diff --git a/app/settings/settingsdialog/settingsdialog.ui b/app/settings/settingsdialog/settingsdialog.ui
index 139f5d332..7ec4a0d89 100644
--- a/app/settings/settingsdialog/settingsdialog.ui
+++ b/app/settings/settingsdialog/settingsdialog.ui
@@ -522,7 +522,7 @@
0
0
1068
- 375
+ 344
@@ -729,77 +729,7 @@
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 70
- 0
-
-
-
-
- 110
- 16777215
-
-
-
- Outline width used from background to draw its borders
-
-
- px.
-
-
- 1
-
-
- 20
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- Outline width used from background to draw its borders
-
-
- outline width
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- 20
- 20
-
-
-
-
-
+
-
@@ -914,37 +844,7 @@
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Plasma Theme:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
-
+
-
diff --git a/app/settings/settingsdialog/tabpreferenceshandler.cpp b/app/settings/settingsdialog/tabpreferenceshandler.cpp
index bb14d3150..659ed8845 100644
--- a/app/settings/settingsdialog/tabpreferenceshandler.cpp
+++ b/app/settings/settingsdialog/tabpreferenceshandler.cpp
@@ -68,11 +68,6 @@ void TabPreferences::initUi()
emit dataChanged();
});
- connect(m_ui->outlineSpinBox, QOverload::of(&QSpinBox::valueChanged), [ = ](int i) {
- m_preferences.outlineWidth = m_ui->outlineSpinBox->value();
- emit dataChanged();
- });
-
connect(m_ui->autostartChkBox, &QCheckBox::stateChanged, this, [&]() {
m_preferences.autostart = m_ui->autostartChkBox->isChecked();
emit dataChanged();
@@ -119,7 +114,6 @@ void TabPreferences::initSettings()
o_preferences.borderlessMaximized = m_corona->universalSettings()->canDisableBorders();
o_preferences.mouseSensitivity = m_corona->universalSettings()->sensitivity();
o_preferences.screensDelay = m_corona->universalSettings()->screenTrackerInterval();
- o_preferences.outlineWidth = m_corona->themeExtended()->outlineWidth();
m_preferences = o_preferences;
@@ -136,7 +130,6 @@ void TabPreferences::updateUi()
m_ui->metaPressHoldChkBox->setChecked(m_preferences.metaHoldForBadges);
m_ui->noBordersForMaximizedChkBox->setChecked(m_preferences.borderlessMaximized);
m_ui->screenTrackerSpinBox->setValue(m_preferences.screensDelay);
- m_ui->outlineSpinBox->setValue(m_preferences.outlineWidth);
if (m_preferences.mouseSensitivity == Settings::LowMouseSensitivity) {
m_ui->lowSensitivityBtn->setChecked(true);
@@ -181,7 +174,6 @@ void TabPreferences::save()
m_corona->universalSettings()->setShowInfoWindow(m_preferences.layoutsInformationWindow);
m_corona->universalSettings()->setCanDisableBorders(m_preferences.borderlessMaximized);
m_corona->universalSettings()->setScreenTrackerInterval(m_preferences.screensDelay);
- m_corona->themeExtended()->setOutlineWidth(m_preferences.outlineWidth);
o_preferences = m_preferences;
emit dataChanged();