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

Add subcontrol for input panel

Browse Source
This commit is contained in:
Peter Hartmann 2018-03-22 15:48:29 +01:00
parent 80249f0c30
commit a28909327b
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
skins/squiek/QskSquiekSkin.cpp
View File

@ -560,6 +560,7 @@ void QskSquiekSkin::initInputPanelHints()
// key panel // key panel
setMargins( QskInputPanel::Panel | Margin, 2 ); setMargins( QskInputPanel::Panel | Margin, 2 );
setButton( QskInputPanel::Panel, Raised );
setButton( Q::Panel, Raised ); setButton( Q::Panel, Raised );
setButton( Q::Panel | Q::Pressed, Sunken ); setButton( Q::Panel | Q::Pressed, Sunken );

14
src/controls/QskInputPanel.cpp
View File

@ -244,6 +244,8 @@ QskInputPanel::QskInputPanel( QQuickItem* parent ):
initSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding ); initSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );
setAutoFillBackground( true );
auto margins = marginsHint( Panel | QskAspect::Margin ); auto margins = marginsHint( Panel | QskAspect::Margin );
setMargins( margins ); setMargins( margins );
@ -260,6 +262,18 @@ QskInputPanel::~QskInputPanel()
{ {
} }
QskAspect::Subcontrol QskInputPanel::effectiveSubcontrol( QskAspect::Subcontrol subControl ) const
{
if( subControl == QskAspect::Control )
{
return QskInputPanel::Panel;
}
return subControl;
}
QskInputPanel::Mode QskInputPanel::mode() const QskInputPanel::Mode QskInputPanel::mode() const
{ {
return m_data->mode; return m_data->mode;

2
src/controls/QskInputPanel.h
View File

@ -89,6 +89,8 @@ public:
QskInputPanel( QQuickItem* parent = nullptr ); QskInputPanel( QQuickItem* parent = nullptr );
virtual ~QskInputPanel() override; virtual ~QskInputPanel() override;
virtual QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol subControl ) const override;
void updateLocale( const QLocale& locale ); void updateLocale( const QLocale& locale );
void setMode( QskInputPanel::Mode index ); void setMode( QskInputPanel::Mode index );