From 1b4176625b7170dda9115f654c458e86035ff4fb Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 13 Jan 2025 17:11:34 +0100 Subject: [PATCH] PlaceholderText -> Placeholder --- designsystems/fluent2/QskFluent2Skin.cpp | 6 +++--- designsystems/fusion/QskFusionSkin.cpp | 6 +++--- designsystems/material3/QskMaterial3Skin.cpp | 8 ++++---- src/controls/QskTextArea.cpp | 2 +- src/controls/QskTextArea.h | 2 +- src/controls/QskTextAreaSkinlet.cpp | 4 ++-- src/controls/QskTextField.cpp | 2 +- src/controls/QskTextField.h | 2 +- src/controls/QskTextFieldSkinlet.cpp | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/designsystems/fluent2/QskFluent2Skin.cpp b/designsystems/fluent2/QskFluent2Skin.cpp index 0d1b59f8..2f49aa24 100644 --- a/designsystems/fluent2/QskFluent2Skin.cpp +++ b/designsystems/fluent2/QskFluent2Skin.cpp @@ -1807,8 +1807,8 @@ template< typename Q > void Editor::setupTextControlMetrics() setFontRole( Q::Text, Fluent2::Body ); - setAlignment( Q::PlaceholderText, alignment( Q::Text ) ); - setFontRole( Q::PlaceholderText, fontRole( Q::Text ) ); + setAlignment( Q::Placeholder, alignment( Q::Text ) ); + setFontRole( Q::Placeholder, fontRole( Q::Text ) ); } template< typename Q, typename SK > void Editor::setupTextControlColors( @@ -1820,7 +1820,7 @@ template< typename Q, typename SK > void Editor::setupTextControlColors( setColor( Q::TextPanel | SK::Selected, pal.fillColor.accent.selectedTextBackground ); setColor( Q::Text | SK::Selected, pal.fillColor.textOnAccent.selectedText ); - setColor( Q::PlaceholderText, pal.fillColor.text.secondary ); + setColor( Q::Placeholder, pal.fillColor.text.secondary ); for( const auto state : { A::NoState, Q::Hovered, Q::Focused, Q::Editing, Q::Disabled } ) { diff --git a/designsystems/fusion/QskFusionSkin.cpp b/designsystems/fusion/QskFusionSkin.cpp index cf173d4f..d034cd86 100644 --- a/designsystems/fusion/QskFusionSkin.cpp +++ b/designsystems/fusion/QskFusionSkin.cpp @@ -404,7 +404,7 @@ void Editor::setupTextControl() setColor( Q::Text | state, m_pal.color( colorGroup, P::Text ) ); setColor( Q::Text | SK::Selected | state, m_pal.color( colorGroup, P::HighlightedText ) ); - setColor( Q::PlaceholderText, m_pal.color( colorGroup, P::PlaceholderText ) ); + setColor( Q::Placeholder, m_pal.color( colorGroup, P::PlaceholderText ) ); } setColor( Q::TextPanel | Q::ReadOnly, m_pal.disabled( P::Base ) ); @@ -426,7 +426,7 @@ void Editor::setupTextArea() using SK = QskTextAreaSkinlet; setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignTop ); - setAlignment( Q::PlaceholderText, Qt::AlignLeft | Qt::AlignTop ); + setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignTop ); setupTextControl< Q, SK >(); } @@ -437,7 +437,7 @@ void Editor::setupTextField() using SK = QskTextFieldSkinlet; setAlignment( Q::Text, Qt::AlignLeft | Qt::AlignVCenter ); - setAlignment( Q::PlaceholderText, Qt::AlignLeft | Qt::AlignVCenter ); + setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignVCenter ); setupTextControl< Q, SK >(); } diff --git a/designsystems/material3/QskMaterial3Skin.cpp b/designsystems/material3/QskMaterial3Skin.cpp index 76ebb2de..63ba72b2 100644 --- a/designsystems/material3/QskMaterial3Skin.cpp +++ b/designsystems/material3/QskMaterial3Skin.cpp @@ -462,7 +462,7 @@ void Editor::setupTextControl() setColor( Q::Text, m_pal.onSurface ); setFontRole( Q::Text, BodyLarge ); - setAlignment( Q::PlaceholderText, Qt::AlignLeft | Qt::AlignVCenter ); + setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignVCenter ); const auto disabledPanelColor = QskRgb::toTransparentF( m_pal.onSurface, 0.04 ); setGradient( Q::Panel | Q::Disabled, disabledPanelColor ); @@ -472,9 +472,9 @@ void Editor::setupTextControl() // PlaceholderText - setColor( Q::PlaceholderText, color( Q::Text ) ); - setFontRole( Q::PlaceholderText, BodyLarge ); - setAlignment( Q::PlaceholderText, alignment( Q::Text ) ); + setColor( Q::Placeholder, color( Q::Text ) ); + setFontRole( Q::Placeholder, BodyLarge ); + setAlignment( Q::Placeholder, alignment( Q::Text ) ); } void Editor::setupTextArea() diff --git a/src/controls/QskTextArea.cpp b/src/controls/QskTextArea.cpp index 679347e6..014efa9e 100644 --- a/src/controls/QskTextArea.cpp +++ b/src/controls/QskTextArea.cpp @@ -6,7 +6,7 @@ #include "QskTextArea.h" QSK_SUBCONTROL( QskTextArea, Panel ) -QSK_SUBCONTROL( QskTextArea, PlaceholderText ) +QSK_SUBCONTROL( QskTextArea, Placeholder ) class QskTextArea::PrivateData { diff --git a/src/controls/QskTextArea.h b/src/controls/QskTextArea.h index 28841b6f..2b9cade4 100644 --- a/src/controls/QskTextArea.h +++ b/src/controls/QskTextArea.h @@ -18,7 +18,7 @@ class QSK_EXPORT QskTextArea : public QskTextEdit using Inherited = QskTextEdit; public: - QSK_SUBCONTROLS( Panel, PlaceholderText ) + QSK_SUBCONTROLS( Panel, Placeholder ) QskTextArea( QQuickItem* parent = nullptr ); QskTextArea( const QString& text, QQuickItem* parent = nullptr ); diff --git a/src/controls/QskTextAreaSkinlet.cpp b/src/controls/QskTextAreaSkinlet.cpp index b57fc044..5401bee2 100644 --- a/src/controls/QskTextAreaSkinlet.cpp +++ b/src/controls/QskTextAreaSkinlet.cpp @@ -27,7 +27,7 @@ QRectF QskTextAreaSkinlet::subControlRect( const QskSkinnable* skinnable, if ( subControl == Q::TextPanel ) return skinnable->subControlContentsRect( contentsRect, Q::Panel ); - if ( subControl == Q::PlaceholderText ) + if ( subControl == Q::Placeholder ) { const auto textArea = static_cast< const QskTextArea* >( skinnable ); if( textArea->text().isEmpty() ) @@ -57,7 +57,7 @@ QSGNode* QskTextAreaSkinlet::updateSubNode( if ( text.isEmpty() ) return nullptr; - const auto subControl = Q::PlaceholderText; + const auto subControl = Q::Placeholder; QskSkinHintStatus status; diff --git a/src/controls/QskTextField.cpp b/src/controls/QskTextField.cpp index 0029bc6d..904a3c6d 100644 --- a/src/controls/QskTextField.cpp +++ b/src/controls/QskTextField.cpp @@ -6,7 +6,7 @@ #include "QskTextField.h" QSK_SUBCONTROL( QskTextField, Panel ) -QSK_SUBCONTROL( QskTextField, PlaceholderText ) +QSK_SUBCONTROL( QskTextField, Placeholder ) class QskTextField::PrivateData { diff --git a/src/controls/QskTextField.h b/src/controls/QskTextField.h index 96d9f5af..e2e1f96a 100644 --- a/src/controls/QskTextField.h +++ b/src/controls/QskTextField.h @@ -18,7 +18,7 @@ class QSK_EXPORT QskTextField : public QskTextInput using Inherited = QskTextInput; public: - QSK_SUBCONTROLS( Panel, PlaceholderText ) + QSK_SUBCONTROLS( Panel, Placeholder ) QskTextField( QQuickItem* parent = nullptr ); QskTextField( const QString& text, QQuickItem* parent = nullptr ); diff --git a/src/controls/QskTextFieldSkinlet.cpp b/src/controls/QskTextFieldSkinlet.cpp index 919e2226..9879f7c0 100644 --- a/src/controls/QskTextFieldSkinlet.cpp +++ b/src/controls/QskTextFieldSkinlet.cpp @@ -27,7 +27,7 @@ QRectF QskTextFieldSkinlet::subControlRect( const QskSkinnable* skinnable, if ( subControl == Q::TextPanel ) return skinnable->subControlContentsRect( contentsRect, Q::Panel ); - if ( subControl == Q::PlaceholderText ) + if ( subControl == Q::Placeholder ) { const auto textField = static_cast< const QskTextField* >( skinnable ); if( textField->text().isEmpty() ) @@ -57,7 +57,7 @@ QSGNode* QskTextFieldSkinlet::updateSubNode( if ( text.isEmpty() ) return nullptr; - const auto subControl = Q::PlaceholderText; + const auto subControl = Q::Placeholder; QskSkinHintStatus status;