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

Merge branch 'master' of https://github.com/uwerat/qskinny

This commit is contained in:
Uwe Rathmann 2025-02-04 11:27:01 +01:00
parent 635691a075 7148c60c16
commit 8dffb14aeb
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
designsystems/fluent2/QskFluent2Skin.cpp
View File

@ -1879,8 +1879,6 @@ void Editor::setupTextFieldMetrics()
{
using Q = QskTextField;
// =============
setStrutSize( Q::TextPanel, { -1, 30_px } );
setPadding( Q::TextPanel, { 11_px, 0, 11_px, 0 } );
@ -1941,6 +1939,7 @@ void Editor::setupTextFieldColors(
setBoxBorderGradient( panel, borderColor1, borderColor2, panelColor );
}
}
void Editor::setupSwitchButtonMetrics()
{
using Q = QskSwitchButton;

16
designsystems/fusion/QskFusionSkin.cpp
View File

@ -401,13 +401,13 @@ void Editor::setupTextInput()
}
}
void Editor::setupTextArea()
void Editor::setupTextField()
{
using Q = QskTextArea;
using Q = QskTextField;
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignTop );
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignVCenter );
// ========
// ===
using A = QskAspect;
using P = QPalette;
@ -435,13 +435,13 @@ void Editor::setupTextArea()
setPadding( Q::TextPanel, 4_px );
}
void Editor::setupTextField()
void Editor::setupTextArea()
{
using Q = QskTextField;
using Q = QskTextArea;
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignVCenter );
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignTop );
// ===
// ========
using A = QskAspect;
using P = QPalette;

2
designsystems/material3/QskMaterial3Skin.cpp
View File

@ -487,8 +487,6 @@ void Editor::setupTextField()
{
using Q = QskTextField;
// ===
setStrutSize( Q::Panel, -1.0, 56_px );
setPadding( Q::Panel, { 12_px, 8_px, 12_px, 8_px } );
setGradient( Q::Panel, m_pal.surfaceVariant );

4
src/controls/QskTextFieldSkinlet.cpp
View File

@ -11,7 +11,7 @@ using Q = QskTextField;
QskTextFieldSkinlet::QskTextFieldSkinlet( QskSkin* skin )
: Inherited( skin )
{
setNodeRoles( { PanelRole, TextPanelRole, PlaceholderTextRole } );
setNodeRoles( { PanelRole, TextPanelRole, PlaceholderRole } );
}
QskTextFieldSkinlet::~QskTextFieldSkinlet()
@ -51,7 +51,7 @@ QSGNode* QskTextFieldSkinlet::updateSubNode(
return updateBoxNode( skinnable, node, Q::Panel );
}
case PlaceholderTextRole:
case PlaceholderRole:
{
const auto text = effectivePlaceholderText( textField );
if ( text.isEmpty() )

2
src/controls/QskTextFieldSkinlet.h
View File

@ -21,7 +21,7 @@ class QSK_EXPORT QskTextFieldSkinlet : public QskAbstractTextInputSkinlet
{
PanelRole = QskAbstractTextInputSkinlet::RoleCount,
PlaceholderTextRole,
PlaceholderRole,
RoleCount
};