mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: don't send values in changed-signals of ThemeInterface

Browse source 
According to the Qt-docs you *may* send the new values in the
NOTIFY signal of Q_PROPERTYs. However, since changes will lead
to a reevaluation of a whole expression, this argument will be
unused. All it does is make the code more verbose and brittle:
What happens if you send the wrong value?

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-30 21:20:49 +02:00 • committed by Dirk Hohndel
parent ce1629ccce
commit 0e9bd27bae
2 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

37
mobile-widgets/themeinterface.cpp
View file

@ -72,18 +72,19 @@ void ThemeInterface::set_currentTheme(const QString &theme)
m_currentTheme = theme;
qPrefDisplay::set_theme(m_currentTheme);
update_theme();
emit currentThemeChanged(theme);
emit currentThemeChanged();
}
double ThemeInterface::currentScale()
{
return qPrefDisplay::mobile_scale();
}
void ThemeInterface::set_currentScale(double newScale)
{
if (newScale != qPrefDisplay::mobile_scale()) {
qPrefDisplay::set_mobile_scale(newScale);
emit currentScaleChanged(qPrefDisplay::mobile_scale());
emit currentScaleChanged();
}
// Set current font size
@ -91,16 +92,16 @@ void ThemeInterface::set_currentScale(double newScale)
// adjust all used font sizes
m_regularPointSize = m_basePointSize * qPrefDisplay::mobile_scale();
emit regularPointSizeChanged(m_regularPointSize);
emit regularPointSizeChanged();
m_headingPointSize = m_regularPointSize * 1.2;
emit headingPointSizeChanged(m_headingPointSize);
emit headingPointSizeChanged();
m_smallPointSize = m_regularPointSize * 0.8;
emit smallPointSizeChanged(m_smallPointSize);
emit smallPointSizeChanged();
m_titlePointSize = m_regularPointSize * 1.5;
emit titlePointSizeChanged(m_titlePointSize);
emit titlePointSizeChanged();
}
void ThemeInterface::update_theme()
@ -145,16 +146,16 @@ void ThemeInterface::update_theme()
m_secondaryTextColor = DARK_SECONDARY_TEXT_COLOR;
m_textColor = DARK_TEXT_COLOR;
}
emit backgroundColorChanged(m_backgroundColor);
emit contrastAccentColorChanged(m_contrastAccentColor);
emit darkerPrimaryColorChanged(m_darkerPrimaryColor);
emit darkerPrimaryTextColorChanged(m_darkerPrimaryTextColor);
emit drawerColorChanged(m_drawerColor);
emit lightDrawerColorChanged(m_lightDrawerColor);
emit lightPrimaryColorChanged(m_lightPrimaryColor);
emit lightPrimaryTextColorChanged(m_lightPrimaryTextColor);
emit primaryColorChanged(m_primaryColor);
emit primaryTextColorChanged(m_primaryTextColor);
emit secondaryTextColorChanged(m_secondaryTextColor);
emit textColorChanged(m_textColor);
emit backgroundColorChanged();
emit contrastAccentColorChanged();
emit darkerPrimaryColorChanged();
emit darkerPrimaryTextColorChanged();
emit drawerColorChanged();
emit lightDrawerColorChanged();
emit lightPrimaryColorChanged();
emit lightPrimaryTextColorChanged();
emit primaryColorChanged();
emit primaryTextColorChanged();
emit secondaryTextColorChanged();
emit textColorChanged();
}

36
mobile-widgets/themeinterface.h
View file

@ -44,26 +44,26 @@ public slots:
void set_currentScale(double);
signals:
void backgroundColorChanged(QColor);
void contrastAccentColorChanged(QColor);
void darkerPrimaryColorChanged(QColor);
void darkerPrimaryTextColorChanged(QColor);
void drawerColorChanged(QColor);
void lightDrawerColorChanged(QColor);
void lightPrimaryColorChanged(QColor);
void lightPrimaryTextColorChanged(QColor);
void primaryColorChanged(QColor);
void primaryTextColorChanged(QColor);
void secondaryTextColorChanged(QColor);
void textColorChanged(QColor);
void backgroundColorChanged();
void contrastAccentColorChanged();
void darkerPrimaryColorChanged();
void darkerPrimaryTextColorChanged();
void drawerColorChanged();
void lightDrawerColorChanged();
void lightPrimaryColorChanged();
void lightPrimaryTextColorChanged();
void primaryColorChanged();
void primaryTextColorChanged();
void secondaryTextColorChanged();
void textColorChanged();
void headingPointSizeChanged(double);
void regularPointSizeChanged(double);
void smallPointSizeChanged(double);
void titlePointSizeChanged(double);
void currentScaleChanged(double);
void headingPointSizeChanged();
void regularPointSizeChanged();
void smallPointSizeChanged();
void titlePointSizeChanged();
void currentScaleChanged();
void currentThemeChanged(const QString &);
void currentThemeChanged();
private:
ThemeInterface() {}