diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index e2b353ba..0093feba 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -559,7 +559,7 @@ void QskSquiekSkin::initInputPanelHints() const ColorPalette& pal = m_data->palette; // key panel -// setMargins( Q::Panel | Margin, 2 ); // should be Panel | Spacing + setMargins( QskInputPanel::Panel | Margin, 2 ); setButton( Q::Panel, Raised ); setButton( Q::Panel | Q::Pressed, Sunken ); diff --git a/src/controls/QskInputPanel.cpp b/src/controls/QskInputPanel.cpp index e49e94db..28c35f89 100644 --- a/src/controls/QskInputPanel.cpp +++ b/src/controls/QskInputPanel.cpp @@ -139,6 +139,8 @@ namespace }; } +QSK_SUBCONTROL( QskInputPanel, Panel ) + QSK_SUBCONTROL( QskKeyButton, Panel ) QSK_SUBCONTROL( QskKeyButton, Text ) QSK_SUBCONTROL( QskKeyButton, TextCancelButton ) @@ -242,6 +244,9 @@ QskInputPanel::QskInputPanel( QQuickItem* parent ): initSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding ); + auto margins = marginsHint( Panel | QskAspect::Margin ); + setMargins( margins ); + updateLocale( locale() ); QObject::connect( this, &QskControl::localeChanged, diff --git a/src/controls/QskInputPanel.h b/src/controls/QskInputPanel.h index 1f18b638..4c893bbe 100644 --- a/src/controls/QskInputPanel.h +++ b/src/controls/QskInputPanel.h @@ -48,6 +48,9 @@ class QSK_EXPORT QskInputPanel : public QskControl using Inherited = QskControl; public: + + QSK_SUBCONTROLS( Panel ) + struct KeyData { Qt::Key key = Qt::Key( 0 );