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

windows style: Style dialog

This commit is contained in:
Peter Hartmann 2023-06-09 10:34:19 +02:00 committed by uwerat
parent 38e6ac5cd4
commit f616997650
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/gallery/dialog/DialogPage.cpp
View File

@ -37,7 +37,7 @@ namespace
, m_type( type ) , m_type( type )
{ {
setShape( 10 ); setShape( 10 );
initSizePolicy( QskSizePolicy::Ignored, QskSizePolicy::Ignored ); initSizePolicy( QskSizePolicy::Preferred, QskSizePolicy::Fixed );
const int index = metaObject()->indexOfEnumerator( "ButtonType" ); const int index = metaObject()->indexOfEnumerator( "ButtonType" );
setText( metaObject()->enumerator( index ).key( m_type ) ); setText( metaObject()->enumerator( index ).key( m_type ) );
@ -84,6 +84,8 @@ DialogPage::DialogPage( QQuickItem* parent )
: Page( Qt::Horizontal, parent ) : Page( Qt::Horizontal, parent )
{ {
auto box = new QskLinearBox( Qt::Horizontal, 2, this ); auto box = new QskLinearBox( Qt::Horizontal, 2, this );
box->setSpacing( 20 );
box->setExtraSpacingAt( Qt::BottomEdge );
for ( int i = 0; i < Button::TypeCount; i++ ) for ( int i = 0; i < Button::TypeCount; i++ )
new Button( static_cast< Button::ButtonType >( i ), box ); new Button( static_cast< Button::ButtonType >( i ), box );

29
skins/windows/QskWindowsSkin.cpp
View File

@ -279,6 +279,11 @@ void Editor::setupComboBox()
void Editor::setupDialogButtonBox() void Editor::setupDialogButtonBox()
{ {
using Q = QskDialogButtonBox;
setPadding( Q::Panel, 24 );
setGradient( Q::Panel, theme.palette.background.fillColor.solidBackground.base );
setPadding(Q::Panel, 20 );
} }
void Editor::setupFocusIndicator() void Editor::setupFocusIndicator()
@ -339,6 +344,9 @@ void Editor::setupPageIndicator()
void Editor::setupPopup() void Editor::setupPopup()
{ {
using Q = QskPopup;
setGradient( Q::Overlay, theme.palette.background.fillColor.smoke.defaultColor );
} }
void Editor::setupProgressBar() void Editor::setupProgressBar()
@ -860,6 +868,23 @@ void Editor::setupSwitchButton()
void Editor::setupSubWindow() void Editor::setupSubWindow()
{ {
using Q = QskSubWindow;
setPadding( Q::Panel, { 0, 31, 0, 0 } );
setBoxShape( Q::Panel, 7 );
setBoxBorderMetrics( Q::Panel, 1 );
setBoxBorderColors( Q::Panel, theme.palette.strokeColor.surfaceStroke.defaultColor );
setGradient( Q::Panel, theme.palette.background.fillColor.layer.alt );
setShadowMetrics( Q::Panel, theme.shadow.dialog.first );
setShadowColor( Q::Panel, theme.shadow.dialog.second );
setHint( Q::TitleBarPanel | QskAspect::Style, Q::TitleBar | Q::Title );
setPadding( Q::TitleBarPanel, { 24, 31, 24, 0 } );
setFontRole( Q::TitleBarText, QskWindowsSkin::Subtitle );
setColor( Q::TitleBarText, theme.palette.fillColor.text.primary );
setAlignment( Q::TitleBarText, Qt::AlignLeft );
setTextOptions( Q::TitleBarText, Qt::ElideRight, QskTextOptions::NoWrap );
} }
void Editor::setupVirtualKeyboard() void Editor::setupVirtualKeyboard()
@ -991,7 +1016,7 @@ QskWindowsTheme::QskWindowsTheme( Theme theme, std::array< QRgb, NumAccentColors
palette.background.fillColor.cardBackground.secondary = QskRgb::toTransparentF( 0xffF6F6F6, 0.50 ); palette.background.fillColor.cardBackground.secondary = QskRgb::toTransparentF( 0xffF6F6F6, 0.50 );
palette.background.fillColor.cardBackground.tertiary = 0xffffffff; palette.background.fillColor.cardBackground.tertiary = 0xffffffff;
palette.background.fillColor.stroke.defaultColor = QskRgb::toTransparentF( 0xff000000, 0.30 ); palette.background.fillColor.smoke.defaultColor = QskRgb::toTransparentF( 0xff000000, 0.30 );
palette.background.fillColor.layer.defaultColor = QskRgb::toTransparentF( 0xffffffff, 0.50 ); palette.background.fillColor.layer.defaultColor = QskRgb::toTransparentF( 0xffffffff, 0.50 );
palette.background.fillColor.layer.alt = 0xffffffff; palette.background.fillColor.layer.alt = 0xffffffff;
@ -1133,7 +1158,7 @@ QskWindowsTheme::QskWindowsTheme( Theme theme, std::array< QRgb, NumAccentColors
palette.background.fillColor.cardBackground.secondary = QskRgb::toTransparentF( 0xffffffff, 0.0326 ); palette.background.fillColor.cardBackground.secondary = QskRgb::toTransparentF( 0xffffffff, 0.0326 );
palette.background.fillColor.cardBackground.tertiary = 0xffffffff; // not set in Figma palette.background.fillColor.cardBackground.tertiary = 0xffffffff; // not set in Figma
palette.background.fillColor.stroke.defaultColor = QskRgb::toTransparentF( 0xff000000, 0.30 ); palette.background.fillColor.smoke.defaultColor = QskRgb::toTransparentF( 0xff000000, 0.30 );
palette.background.fillColor.layer.defaultColor = QskRgb::toTransparentF( 0xff3A3A3A, 0.30 ); palette.background.fillColor.layer.defaultColor = QskRgb::toTransparentF( 0xff3A3A3A, 0.30 );
palette.background.fillColor.layer.alt = QskRgb::toTransparentF( 0xffffffff, 0.0538 ); palette.background.fillColor.layer.alt = QskRgb::toTransparentF( 0xffffffff, 0.0538 );

4
skins/windows/QskWindowsSkin.h
View File

@ -244,7 +244,7 @@ class QSK_WINDOWS_EXPORT QskWindowsTheme
QRgb tertiary; QRgb tertiary;
}; };
struct Stroke struct Smoke
{ {
QRgb defaultColor; QRgb defaultColor;
}; };
@ -291,7 +291,7 @@ class QSK_WINDOWS_EXPORT QskWindowsTheme
}; };
CardBackground cardBackground; CardBackground cardBackground;
Stroke stroke; Smoke smoke;
Layer layer; Layer layer;
LayerOnAcrylic layerOnAcrylic; LayerOnAcrylic layerOnAcrylic;
LayerOnAccentAcrylic layerOnAccentAcrylic; LayerOnAccentAcrylic layerOnAccentAcrylic;