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

input panel: derive from QskBox

This commit is contained in:
Peter Hartmann 2018-03-28 15:31:44 +02:00
parent c1945a00ec
commit 7af9cc6cdf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controls/QskInputPanel.cpp
View File

@ -259,7 +259,7 @@ class QskInputPanel::PrivateData
}; };
QskInputPanel::QskInputPanel( QQuickItem* parent ): QskInputPanel::QskInputPanel( QQuickItem* parent ):
QskControl( parent ), Inherited( parent ),
m_data( new PrivateData ) m_data( new PrivateData )
{ {
qRegisterMetaType< Qt::Key >(); qRegisterMetaType< Qt::Key >();
@ -324,7 +324,7 @@ QskInputPanel::~QskInputPanel()
QskAspect::Subcontrol QskInputPanel::effectiveSubcontrol( QskAspect::Subcontrol subControl ) const QskAspect::Subcontrol QskInputPanel::effectiveSubcontrol( QskAspect::Subcontrol subControl ) const
{ {
if( subControl == QskAspect::Control ) if( subControl == QskBox::Panel )
{ {
return QskInputPanel::Panel; return QskInputPanel::Panel;
} }

6
src/controls/QskInputPanel.h
View File

@ -6,7 +6,7 @@
#ifndef QSK_INPUT_PANEL_H #ifndef QSK_INPUT_PANEL_H
#define QSK_INPUT_PANEL_H #define QSK_INPUT_PANEL_H
#include "QskControl.h" #include "QskBox.h"
#include "QskPushButton.h" #include "QskPushButton.h"
#include <QRectF> #include <QRectF>
@ -38,7 +38,7 @@ class QskKeyButton : public QskPushButton // ### rename to QskInputButton or so?
QskInputPanel* m_inputPanel; QskInputPanel* m_inputPanel;
}; };
class QSK_EXPORT QskInputPanel : public QskControl class QSK_EXPORT QskInputPanel : public QskBox
{ {
Q_OBJECT Q_OBJECT
@ -47,7 +47,7 @@ class QSK_EXPORT QskInputPanel : public QskControl
Q_PROPERTY( QString displayLanguageName READ displayLanguageName Q_PROPERTY( QString displayLanguageName READ displayLanguageName
NOTIFY displayLanguageNameChanged ) NOTIFY displayLanguageNameChanged )
using Inherited = QskControl; using Inherited = QskBox;
public: public: