diff --git a/designsystems/fluent2/QskFluent2Skin.cpp b/designsystems/fluent2/QskFluent2Skin.cpp index f3e60d1a..932d0b2d 100644 --- a/designsystems/fluent2/QskFluent2Skin.cpp +++ b/designsystems/fluent2/QskFluent2Skin.cpp @@ -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; diff --git a/designsystems/fusion/QskFusionSkin.cpp b/designsystems/fusion/QskFusionSkin.cpp index 7708f091..2e19ec60 100644 --- a/designsystems/fusion/QskFusionSkin.cpp +++ b/designsystems/fusion/QskFusionSkin.cpp @@ -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; diff --git a/designsystems/material3/QskMaterial3Skin.cpp b/designsystems/material3/QskMaterial3Skin.cpp index 73cc05d1..fbe80e23 100644 --- a/designsystems/material3/QskMaterial3Skin.cpp +++ b/designsystems/material3/QskMaterial3Skin.cpp @@ -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 ); diff --git a/src/controls/QskTextFieldSkinlet.cpp b/src/controls/QskTextFieldSkinlet.cpp index 9879f7c0..9a112ef7 100644 --- a/src/controls/QskTextFieldSkinlet.cpp +++ b/src/controls/QskTextFieldSkinlet.cpp @@ -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() ) diff --git a/src/controls/QskTextFieldSkinlet.h b/src/controls/QskTextFieldSkinlet.h index ce28d4c3..82b6072e 100644 --- a/src/controls/QskTextFieldSkinlet.h +++ b/src/controls/QskTextFieldSkinlet.h @@ -21,7 +21,7 @@ class QSK_EXPORT QskTextFieldSkinlet : public QskAbstractTextInputSkinlet { PanelRole = QskAbstractTextInputSkinlet::RoleCount, - PlaceholderTextRole, + PlaceholderRole, RoleCount };