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

Move skin related stuff to skins.

This commit is contained in:
Clemens Manert 2023-05-01 20:21:07 +02:00 committed by uwerat
parent 52d75a894f
commit be3b2339e8
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
skins/material3/QskMaterial3Skin.cpp
View File

@ -12,6 +12,7 @@
#include <QskComboBox.h> #include <QskComboBox.h>
#include <QskColorFilter.h> #include <QskColorFilter.h>
#include <QskDialogButtonBox.h> #include <QskDialogButtonBox.h>
#include <QskDrawer.h>
#include <QskFocusIndicator.h> #include <QskFocusIndicator.h>
#include <QskFunctions.h> #include <QskFunctions.h>
#include <QskGraphic.h> #include <QskGraphic.h>
@ -84,6 +85,7 @@ namespace
void setupCheckBox(); void setupCheckBox();
void setupComboBox(); void setupComboBox();
void setupDialogButtonBox(); void setupDialogButtonBox();
void setupDrawer();
void setupFocusIndicator(); void setupFocusIndicator();
void setupInputPanel(); void setupInputPanel();
void setupVirtualKeyboard(); void setupVirtualKeyboard();
@ -150,6 +152,7 @@ void Editor::setup()
setupCheckBox(); setupCheckBox();
setupComboBox(); setupComboBox();
setupDialogButtonBox(); setupDialogButtonBox();
setupDrawer();
setupFocusIndicator(); setupFocusIndicator();
setupInputPanel(); setupInputPanel();
setupVirtualKeyboard(); setupVirtualKeyboard();
@ -786,6 +789,13 @@ void Editor::setupDialogButtonBox()
setBoxBorderMetrics( Q::Panel, 0 ); setBoxBorderMetrics( Q::Panel, 0 );
} }
void Editor::setupDrawer() {
using Q = QskDrawer;
setAnimation( Q::Panel | QskAspect::Position, 5000 );
setHint( Q::Overlay | QskAspect::Style, false );
}
void Editor::setupSlider() void Editor::setupSlider()
{ {
using A = QskAspect; using A = QskAspect;

10
skins/squiek/QskSquiekSkin.cpp
View File

@ -11,6 +11,7 @@
#include <QskCheckBox.h> #include <QskCheckBox.h>
#include <QskComboBox.h> #include <QskComboBox.h>
#include <QskDialogButtonBox.h> #include <QskDialogButtonBox.h>
#include <QskDrawer.h>
#include <QskFocusIndicator.h> #include <QskFocusIndicator.h>
#include <QskInputPanelBox.h> #include <QskInputPanelBox.h>
#include <QskInputPredictionBar.h> #include <QskInputPredictionBar.h>
@ -151,6 +152,7 @@ namespace
void setupCheckBox(); void setupCheckBox();
void setupComboBox(); void setupComboBox();
void setupDialogButtonBox(); void setupDialogButtonBox();
void setupDrawer();
void setupFocusIndicator(); void setupFocusIndicator();
void setupInputPanel(); void setupInputPanel();
void setupInputPredictionBar(); void setupInputPredictionBar();
@ -275,6 +277,7 @@ void Editor::setup()
setupCheckBox(); setupCheckBox();
setupComboBox(); setupComboBox();
setupDialogButtonBox(); setupDialogButtonBox();
setupDrawer();
setupFocusIndicator(); setupFocusIndicator();
setupInputPanel(); setupInputPanel();
setupInputPredictionBar(); setupInputPredictionBar();
@ -730,6 +733,13 @@ void Editor::setupDialogButtonBox()
setBoxShape( Q::Panel, 2 ); setBoxShape( Q::Panel, 2 );
} }
void Editor::setupDrawer() {
using Q = QskDrawer;
setAnimation( Q::Panel | QskAspect::Position, qskDuration );
setHint( Q::Overlay | QskAspect::Style, false );
}
void Editor::setupTabButton() void Editor::setupTabButton()
{ {
using A = QskAspect; using A = QskAspect;

6
src/layouts/QskDrawer.cpp
View File

@ -8,6 +8,7 @@
#include <QskQuick.h> #include <QskQuick.h>
QSK_SUBCONTROL( QskDrawer, Panel ) QSK_SUBCONTROL( QskDrawer, Panel )
QSK_SUBCONTROL( QskDrawer, Overlay )
class QskDrawer::PrivateData { class QskDrawer::PrivateData {
public: public:
@ -27,13 +28,10 @@ QskDrawer::QskDrawer( QQuickItem* parentItem ) :
m_data->contentBox = new QskBox(this); m_data->contentBox = new QskBox(this);
m_data->contentBox->setSubcontrolProxy( QskBox::Panel, Panel ); m_data->contentBox->setSubcontrolProxy( QskBox::Panel, Panel );
setSubcontrolProxy( Inherited::Overlay, Overlay );
setAnimationHint( Panel | QskAspect::Position, QskAnimationHint( 5000 ) );
setFaderAspect( Panel | QskAspect::Metric ); setFaderAspect( Panel | QskAspect::Metric );
setSkinHint( Overlay | QskAspect::Style, false );
connect(this, &QskDrawer::closed, this, [this]() { connect(this, &QskDrawer::closed, this, [this]() {
startTransition( Panel | QskAspect::Metric, startTransition( Panel | QskAspect::Metric,
animationHint( Panel | QskAspect::Position ), animationHint( Panel | QskAspect::Position ),

2
src/layouts/QskDrawer.h
View File

@ -13,7 +13,7 @@ class QSK_EXPORT QskDrawer : public QskPopup
Q_PROPERTY( Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged ) Q_PROPERTY( Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged )
public: public:
QSK_SUBCONTROLS( Panel ) QSK_SUBCONTROLS( Panel, Overlay )
QskDrawer( QQuickItem* parentItem = nullptr ); QskDrawer( QQuickItem* parentItem = nullptr );
~QskDrawer() override; ~QskDrawer() override;