peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Material skin: Allow setting a different palette"

Browse Source 
This reverts commit 421db106da4724aee16274ecfb818713e3ac61d7.

We cannot easily change this on the fly anyhow.
This commit is contained in:
Peter Hartmann 2022-06-07 16:21:04 +02:00
parent 421db106da
commit a810739254
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
skins/material/QskMaterialSkin.cpp
View File

@ -809,16 +809,10 @@ QskMaterialTheme::QskMaterialTheme( Lightness lightness )
QskMaterialTheme::QskMaterialTheme( Lightness lightness, QskMaterialTheme::QskMaterialTheme( Lightness lightness,
std::array< QskRgbPalette, NumPaletteTypes > palettes ) std::array< QskRgbPalette, NumPaletteTypes > palettes )
: m_palettes( palettes ) : m_palettes( palettes )
, m_lightness( lightness )
{
initColors();
}
void QskMaterialTheme::initColors()
{ {
using Q = QskRgbPalette; using Q = QskRgbPalette;
if ( m_lightness == Light ) if ( lightness == Light )
{ {
primary = m_palettes[ Primary ].rgb( Q::W40 ); primary = m_palettes[ Primary ].rgb( Q::W40 );
onPrimary = m_palettes[ Primary ].rgb( Q::W100 ); onPrimary = m_palettes[ Primary ].rgb( Q::W100 );
@ -849,7 +843,7 @@ void QskMaterialTheme::initColors()
onSurfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W30 ); onSurfaceVariant = m_palettes[ NeutralVariant ].rgb( Q::W30 );
outline = m_palettes[ NeutralVariant ].rgb( Q::W50 ); outline = m_palettes[ NeutralVariant ].rgb( Q::W50 );
} }
else if ( m_lightness == Dark ) else if ( lightness == Dark )
{ {
primary = m_palettes[ Primary ].rgb( Q::W80 ); primary = m_palettes[ Primary ].rgb( Q::W80 );
onPrimary = m_palettes[ Primary ].rgb( Q::W20 ); onPrimary = m_palettes[ Primary ].rgb( Q::W20 );
@ -882,41 +876,19 @@ void QskMaterialTheme::initColors()
} }
} }
std::array< QskRgbPalette, QskMaterialTheme::NumPaletteTypes > QskMaterialTheme::palettes() const QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& palette, QObject* parent )
{
return m_palettes;
}
void QskMaterialTheme::setPalette( PaletteType type, const QskRgbPalette& palette )
{
m_palettes[ type ] = palette;
initColors();
}
QskMaterialSkin::QskMaterialSkin( const QskMaterialTheme& theme, QObject* parent )
: Inherited( parent ) : Inherited( parent )
, m_theme( theme )
{ {
setupFonts(); setupFonts();
init( theme );
Editor editor( &hintTable(), palette );
editor.setup();
} }
QskMaterialSkin::~QskMaterialSkin() QskMaterialSkin::~QskMaterialSkin()
{ {
} }
void QskMaterialSkin::setPalette( QskMaterialTheme::PaletteType type,
const QskRgbPalette& palette )
{
m_theme.setPalette( type, palette );
}
void QskMaterialSkin::init( const QskMaterialTheme& palette )
{
Editor editor( &hintTable(), palette );
editor.setup();
}
void QskMaterialSkin::setupFonts() void QskMaterialSkin::setupFonts()
{ {
Inherited::setupFonts( QStringLiteral( "Roboto" ) ); Inherited::setupFonts( QStringLiteral( "Roboto" ) );

11
skins/material/QskMaterialSkin.h
View File

@ -68,14 +68,8 @@ class QSK_MATERIAL_EXPORT QskMaterialTheme
const qreal pressedOpacity = 0.12; const qreal pressedOpacity = 0.12;
const qreal draggedOpacity = 0.16; const qreal draggedOpacity = 0.16;
std::array< QskRgbPalette, NumPaletteTypes > palettes() const;
void setPalette( PaletteType type, const QskRgbPalette& palette );
private: private:
void initColors();
std::array< QskRgbPalette, NumPaletteTypes > m_palettes; std::array< QskRgbPalette, NumPaletteTypes > m_palettes;
Lightness m_lightness;
}; };
class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin
@ -93,13 +87,10 @@ class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin
M3LabelLarge = QskSkin::HugeFont + 1, M3LabelLarge = QskSkin::HugeFont + 1,
}; };
void setPalette( QskMaterialTheme::PaletteType, const QskRgbPalette& palette ); // ### add setTheme() re-implement resetColors()
private: private:
void init( const QskMaterialTheme& palette );
void setupFonts(); void setupFonts();
QskMaterialTheme m_theme;
}; };
#endif #endif