diff --git a/skins/fluent2/QskFluent2Skin.cpp b/skins/fluent2/QskFluent2Skin.cpp index 7261baaa..1b90f732 100644 --- a/skins/fluent2/QskFluent2Skin.cpp +++ b/skins/fluent2/QskFluent2Skin.cpp @@ -73,6 +73,7 @@ #include #include #include +#include #include #include #include @@ -195,6 +196,9 @@ namespace void setupDialogButtonBoxMetrics(); void setupDialogButtonBoxColors( QskAspect::Section, const QskFluent2Theme& ); + void setupDrawerMetrics(); + void setupDrawerColors( QskAspect::Section, const QskFluent2Theme& ); + void setupFocusIndicatorMetrics(); void setupFocusIndicatorColors( QskAspect::Section, const QskFluent2Theme& ); @@ -289,6 +293,7 @@ void Editor::setupMetrics() setupCheckBoxMetrics(); setupComboBoxMetrics(); setupDialogButtonBoxMetrics(); + setupDrawerMetrics(); setupFocusIndicatorMetrics(); setupGraphicLabelMetrics(); setupListViewMetrics(); @@ -325,6 +330,7 @@ void Editor::setupColors( QskAspect::Section section, const QskFluent2Theme& the setupCheckBoxColors( section, theme ); setupComboBoxColors( section, theme ); setupDialogButtonBoxColors( section, theme ); + setupDrawerColors( section, theme ); setupFocusIndicatorColors( section, theme ); setupGraphicLabelColors( section, theme ); setupGraphicLabelMetrics(); @@ -597,6 +603,26 @@ void Editor::setupDialogButtonBoxColors( theme.palette.background.solid.base ); } +void Editor::setupDrawerMetrics() +{ + using Q = QskDrawer; + + setPadding( Q::Panel, 5 ); + setHint( Q::Overlay | QskAspect::Style, false ); + +#if 1 + setAnimation( Q::Panel | QskAspect::Position, 200 ); +#endif +} + +void Editor::setupDrawerColors( + QskAspect::Section section, const QskFluent2Theme& theme ) +{ + using Q = QskDrawer; + + setGradient( Q::Panel | section, theme.palette.background.solid.base ); +} + void Editor::setupFocusIndicatorMetrics() { using Q = QskFocusIndicator; diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index f9537a55..957c1ba2 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -812,8 +812,9 @@ void Editor::setupDrawer() setPadding( Q::Panel, 5_dp ); setGradient( Q::Panel, m_pal.background ); - setAnimation( Q::Panel | QskAspect::Position, qskDuration ); setHint( Q::Overlay | QskAspect::Style, false ); + + setAnimation( Q::Panel | QskAspect::Position, qskDuration ); } void Editor::setupSlider() diff --git a/src/controls/QskDrawer.h b/src/controls/QskDrawer.h index 240f3f5d..442f95e7 100644 --- a/src/controls/QskDrawer.h +++ b/src/controls/QskDrawer.h @@ -15,15 +15,15 @@ class QSK_EXPORT QskDrawer : public QskPopup public: QSK_SUBCONTROLS( Panel, Overlay ) - QskDrawer( QQuickItem* parentItem = nullptr ); + QskDrawer( QQuickItem* = nullptr ); ~QskDrawer() override; - void setEdge( Qt::Edge edge ); + void setEdge( Qt::Edge ); Qt::Edge edge() const; void updateLayout() override; - void setContent( QskControl* t ); + void setContent( QskControl* ); Q_SIGNALS: void edgeChanged( Qt::Edge );