From 87bfa8611f87693792efa1bb5a145d0e9d661fd4 Mon Sep 17 00:00:00 2001 From: Clemens Manert Date: Tue, 2 May 2023 00:39:16 +0200 Subject: [PATCH] Respect panel's padding --- skins/material3/QskMaterial3Skin.cpp | 2 ++ skins/squiek/QskSquiekSkin.cpp | 2 ++ src/layouts/QskDrawer.cpp | 11 +++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index 67666923..df48b8ac 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -792,6 +792,8 @@ void Editor::setupDialogButtonBox() void Editor::setupDrawer() { using Q = QskDrawer; + setPadding( Q::Panel, 5_dp ); + setGradient( Q::Panel, m_pal.background ); setAnimation( Q::Panel | QskAspect::Position, qskDuration ); setHint( Q::Overlay | QskAspect::Style, false ); } diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index 19db9617..e757e5b5 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -736,6 +736,8 @@ void Editor::setupDialogButtonBox() void Editor::setupDrawer() { using Q = QskDrawer; + setPadding( Q::Panel, 5 ); + setGradient( Q::Panel, m_pal.darker125 ); setAnimation( Q::Panel | QskAspect::Position, qskDuration ); setHint( Q::Overlay | QskAspect::Style, false ); } diff --git a/src/layouts/QskDrawer.cpp b/src/layouts/QskDrawer.cpp index 4d404f40..52c9fcff 100644 --- a/src/layouts/QskDrawer.cpp +++ b/src/layouts/QskDrawer.cpp @@ -65,7 +65,9 @@ void QskDrawer::setContent( QskControl* content ) { } void QskDrawer::updateLayout() { - const auto& contentSize = m_data->content->preferredSize(); + const auto& padding = paddingHint( Panel ); + const auto& contentSize = m_data->content->preferredSize() + .grownBy( padding ); const auto& parentSize = parentItem()->size(); switch( m_data->edge ) { @@ -85,8 +87,8 @@ void QskDrawer::updateLayout() { - contentSize.width(); qskSetItemGeometry( m_data->contentBox, - x, 0, - contentSize.width(), parentSize.height()); + x, 0, + contentSize.width(), parentSize.height() ); break; } @@ -111,7 +113,8 @@ void QskDrawer::updateLayout() { break; } } - m_data->content->setGeometry( QPointF(), m_data->contentBox->size() ); + m_data->content->setGeometry( QPointF( padding.left(), padding.top() ), + m_data->contentBox->size().shrunkBy( padding ) ); Inherited::updateLayout(); }