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

style menu

This commit is contained in:
Peter Hartmann 2022-06-13 15:36:06 +02:00
parent e6120baf15
commit 3a0b3b077d
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
skins/material/QskMaterialSkin.cpp
View File

@ -196,30 +196,32 @@ void Editor::setupMenu()
using A = QskAspect; using A = QskAspect;
using Q = QskMenu; using Q = QskMenu;
setBoxShape( Q::Panel, qskDpiScaled( 4 ) ); setBoxShape( Q::Panel, 4 );
setBoxBorderMetrics( Q::Panel, qskDpiScaled( 1 ) ); setBoxBorderMetrics( Q::Panel, 0 );
setBoxBorderColors( Q::Panel, m_pal.primary ); setPadding( Q::Panel, 0 );
setGradient( Q::Panel, m_pal.background ); QColor primary08( m_pal.primary );
primary08.setAlphaF( 0.08 );
setGradient( Q::Panel, primary08 );
setFlagHint( Q::Panel | A::Style, false ); // not cascading
#if 0
setPadding( Q::Separator, QMarginsF( 10, 0, 10, 0 ) );
#endif
setMetric( Q::Separator | A::Size, qskDpiScaled( 1 ) ); setMetric( Q::Separator | A::Size, qskDpiScaled( 1 ) );
setBoxShape( Q::Separator, 0 ); setBoxShape( Q::Separator, 0 );
setBoxBorderMetrics( Q::Separator, 0 ); setBoxBorderMetrics( Q::Separator, 0 );
setGradient( Q::Separator, m_pal.primary ); QColor primary12( m_pal.primary );
primary12.setAlphaF( 0.12 );
setGradient( Q::Separator, primary12 );
setPadding( Q::Segment, QskMargins( 2, 10, 2, 10 ) ); setPadding( Q::Segment, 6 );
setSpacing( Q::Segment, 5 ); setSpacing( Q::Segment, 5 );
setGradient( Q::Segment, Qt::transparent ); setGradient( Q::Segment, Qt::transparent );
setGradient( Q::Cursor, m_pal.primary ); setGradient( Q::Cursor, primary12 );
setColor( Q::Text, m_pal.onBackground ); setPadding( Q::Graphic, 7 );
setFontRole( Q::Text, QskSkin::SmallFont ); setStrutSize( Q::Graphic, { 46, -1 } );
setColor( Q::Text, m_pal.onSurface );
setFontRole( Q::Text, QskMaterialSkin::M3BodyLarge );
setPosition( Q::Panel, 0 ); setPosition( Q::Panel, 0 );
setPosition( Q::Panel | QskPopup::Closed, 1 ); setPosition( Q::Panel | QskPopup::Closed, 1 );
@ -921,6 +923,7 @@ void QskMaterialSkin::setupFonts()
{ {
Inherited::setupFonts( QStringLiteral( "Roboto" ) ); Inherited::setupFonts( QStringLiteral( "Roboto" ) );
setFont( M3BodyLarge, createFont( 16 ) );
setFont( M3LabelLarge, createFont( 14 ) ); setFont( M3LabelLarge, createFont( 14 ) );
} }

3
skins/material/QskMaterialSkin.h
View File

@ -84,7 +84,8 @@ class QSK_MATERIAL_EXPORT QskMaterialSkin : public QskSkin
enum FontRole enum FontRole
{ {
M3LabelLarge = QskSkin::HugeFont + 1, M3BodyLarge = QskSkin::HugeFont + 1,
M3LabelLarge,
}; };
// ### add setTheme() re-implement resetColors() // ### add setTheme() re-implement resetColors()