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

fusion skin improved

Browse Source
This commit is contained in:
Uwe Rathmann 2024-12-03 13:33:17 +01:00
parent 4540cc1e4e
commit e86378a072
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
designsystems/fusion/QskFusionSkin.cpp
View File

@ -390,22 +390,23 @@ void Editor::setupTextField()
using A = QskAspect; using A = QskAspect;
using P = QPalette; using P = QPalette;
setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignTop ); setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignVCenter );
setAlignment( Q::PlaceholderText, Qt::AlignLeft | Qt::AlignVCenter );
for ( auto state : { A::NoState, Q::Disabled } ) for ( auto state : { A::NoState, Q::Disabled } )
{ {
const auto colorGroup = ( state == A::NoState ) ? P::Active : P::Disabled; const auto colorGroup = ( state == A::NoState ) ? P::Active : P::Disabled;
setGradient( Q::Panel | state, m_pal.color( colorGroup, P::Base ) ); setColor( Q::Panel | state, m_pal.color( colorGroup, P::Base ) );
setColor( Q::Panel | SK::Selected | state, m_pal.color( colorGroup, P::Highlight ) );
setColor( Q::Text | state, m_pal.color( colorGroup, P::Text ) ); setColor( Q::Text | state, m_pal.color( colorGroup, P::Text ) );
setColor( Q::Text | SK::Selected | state, m_pal.color( colorGroup, P::HighlightedText ) );
setColor( Q::Panel | SK::Selected | state, setColor( Q::PlaceholderText, m_pal.color( colorGroup, P::PlaceholderText ) );
m_pal.color( colorGroup, P::Highlight ) );
setColor( Q::Text | SK::Selected | state,
m_pal.color( colorGroup, P::HighlightedText ) );
} }
setColor( Q::Panel | Q::ReadOnly, m_pal.disabled( P::Base ) );
setBoxBorderMetrics( Q::Panel, 1_px ); setBoxBorderMetrics( Q::Panel, 1_px );
setBoxBorderColors( Q::Panel, m_pal.outline ); setBoxBorderColors( Q::Panel, m_pal.outline );
@ -413,7 +414,7 @@ void Editor::setupTextField()
setBoxBorderColors( Q::Panel | Q::Focused, m_pal.highlightedOutline ); setBoxBorderColors( Q::Panel | Q::Focused, m_pal.highlightedOutline );
#endif #endif
setBoxShape( Q::Panel, 2 ); setBoxShape( Q::Panel, 2_px );
setPadding( Q::Panel, 4_px ); setPadding( Q::Panel, 4_px );
} }

10
examples/gallery/inputs/InputPage.cpp
View File

@ -61,10 +61,10 @@ namespace
} }
}; };
class InputBox : public QskLinearBox class TextInputBox : public QskLinearBox
{ {
public: public:
InputBox( QQuickItem* parent = nullptr ) TextInputBox( QQuickItem* parent = nullptr )
: QskLinearBox( Qt::Horizontal, parent ) : QskLinearBox( Qt::Horizontal, parent )
{ {
setSpacing( 20 ); setSpacing( 20 );
@ -117,8 +117,8 @@ InputPage::InputPage( QQuickItem* parent )
auto spinBox = new QskSpinBox( 0.0, 100.0, 1.0 ); auto spinBox = new QskSpinBox( 0.0, 100.0, 1.0 );
spinBox->setSizePolicy( Qt::Horizontal, QskSizePolicy::Fixed ); spinBox->setSizePolicy( Qt::Horizontal, QskSizePolicy::Fixed );
auto inputBox = new InputBox(); auto textInputBox = new TextInputBox();
inputBox->setSizePolicy( Qt::Vertical, QskSizePolicy::Fixed ); textInputBox->setSizePolicy( Qt::Vertical, QskSizePolicy::Fixed );
auto vBox = new QskLinearBox( Qt::Vertical ); auto vBox = new QskLinearBox( Qt::Vertical );
vBox->setSpacing( 30 ); vBox->setSpacing( 30 );
@ -127,7 +127,7 @@ InputPage::InputPage( QQuickItem* parent )
vBox->addItem( sliders[0].continous ); vBox->addItem( sliders[0].continous );
vBox->addItem( sliders[0].discrete ); vBox->addItem( sliders[0].discrete );
vBox->addItem( sliders[0].centered ); vBox->addItem( sliders[0].centered );
vBox->addItem( inputBox ); vBox->addItem( textInputBox );
vBox->addItem( spinBox ); vBox->addItem( spinBox );
auto mainBox = new QskLinearBox( Qt::Horizontal, this ); auto mainBox = new QskLinearBox( Qt::Horizontal, this );