update option for Plasma Background Roundness

--that option now supports also Automatic in order
for Latte background parts to use the Latte heuristics
in order to identify the proper roundness
pull/4/head
Michail Vourlakos 6 years ago
parent 6a235244b3
commit e780184d0c

@ -85,27 +85,27 @@ bool Theme::isDarkTheme() const
int Theme::bottomEdgeRoundness() const int Theme::bottomEdgeRoundness() const
{ {
return (themeHasExtendedInfo() ? m_bottomEdgeRoundness : userThemeRoundness()); return ((themeHasExtendedInfo() && m_userRoundness == -1) ? m_bottomEdgeRoundness : userThemeRoundness());
} }
int Theme::leftEdgeRoundness() const int Theme::leftEdgeRoundness() const
{ {
return (themeHasExtendedInfo() ? m_leftEdgeRoundness : userThemeRoundness()); return ((themeHasExtendedInfo() && m_userRoundness == -1) ? m_leftEdgeRoundness : userThemeRoundness());
} }
int Theme::topEdgeRoundness() const int Theme::topEdgeRoundness() const
{ {
return (themeHasExtendedInfo() ? m_topEdgeRoundness : userThemeRoundness()); return ((themeHasExtendedInfo() && m_userRoundness == -1) ? m_topEdgeRoundness : userThemeRoundness());
} }
int Theme::rightEdgeRoundness() const int Theme::rightEdgeRoundness() const
{ {
return (themeHasExtendedInfo() ? m_rightEdgeRoundness : userThemeRoundness()); return ((themeHasExtendedInfo() && m_userRoundness == -1) ? m_rightEdgeRoundness : userThemeRoundness());
} }
int Theme::userThemeRoundness() const int Theme::userThemeRoundness() const
{ {
return m_userRoundness; return qMax(0, m_userRoundness);
} }
void Theme::setUserThemeRoundness(int roundness) void Theme::setUserThemeRoundness(int roundness)
@ -116,9 +116,7 @@ void Theme::setUserThemeRoundness(int roundness)
m_userRoundness = roundness; m_userRoundness = roundness;
if (!themeHasExtendedInfo()) { emit roundnessChanged();
emit roundnessChanged();
}
saveConfig(); saveConfig();
} }
@ -397,7 +395,7 @@ void Theme::loadThemeLightness()
void Theme::loadConfig() void Theme::loadConfig()
{ {
m_userRoundness = m_themeGroup.readEntry("userSetPlasmaThemeRoundness", 0); setUserThemeRoundness(m_themeGroup.readEntry("userSetPlasmaThemeRoundness", -1));
} }
void Theme::saveConfig() void Theme::saveConfig()

@ -113,7 +113,7 @@ private:
int m_leftEdgeRoundness{0}; int m_leftEdgeRoundness{0};
int m_topEdgeRoundness{0}; int m_topEdgeRoundness{0};
int m_rightEdgeRoundness{0}; int m_rightEdgeRoundness{0};
int m_userRoundness{0}; int m_userRoundness{-1};
QString m_themePath; QString m_themePath;
QString m_defaultSchemePath; QString m_defaultSchemePath;

@ -136,6 +136,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona)
m_mouseSensitivityButtons->setExclusive(true); m_mouseSensitivityButtons->setExclusive(true);
ui->screenTrackerSpinBox->setValue(m_corona->universalSettings()->screenTrackerInterval()); ui->screenTrackerSpinBox->setValue(m_corona->universalSettings()->screenTrackerInterval());
ui->themeRoundnessSpinBox->setSpecialValueText(i18nc("automatic background roundness","Automatic"));
ui->themeRoundnessSpinBox->setValue(m_corona->themeExtended()->userThemeRoundness()); ui->themeRoundnessSpinBox->setValue(m_corona->themeExtended()->userThemeRoundness());
//! About Menu //! About Menu

@ -946,11 +946,10 @@ This tracker is used in order to not lose any screen related update.</string>
<item> <item>
<widget class="QLabel" name="plasmaRoundnessLbl"> <widget class="QLabel" name="plasmaRoundnessLbl">
<property name="toolTip"> <property name="toolTip">
<string>Roundness used from Latte elements in order to feel part of the current plasma theme <string>Roundness used from Latte elements in order to feel part of the current plasma theme</string>
when there are no other roundness information.</string>
</property> </property>
<property name="text"> <property name="text">
<string>User set background roundness</string> <string>Background roundness</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -978,8 +977,11 @@ when there are no other roundness information.</string>
<property name="suffix"> <property name="suffix">
<string> px.</string> <string> px.</string>
</property> </property>
<property name="minimum">
<number>-1</number>
</property>
<property name="maximum"> <property name="maximum">
<number>24</number> <number>32</number>
</property> </property>
</widget> </widget>
</item> </item>

Loading…
Cancel
Save