From e15f1679781d64f243c3205914896b74ec72d024 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 28 Oct 2024 09:26:22 +0100 Subject: [PATCH] QskTextInput::wrapMode added --- src/controls/QskTextInput.cpp | 15 +++++++++++++++ src/controls/QskTextInput.h | 10 +++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index b204cbd8..a4982bcc 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -59,6 +59,9 @@ static inline void qskBindSignals( QObject::connect( wrappedInput, &QQuickTextInput::maximumLengthChanged, input, &QskTextInput::maximumLengthChanged ); + QObject::connect( wrappedInput, &QQuickTextInput::wrapModeChanged, + input, [ input ] { Q_EMIT input->wrapModeChanged( input->wrapMode() ); } ); + QObject::connect( wrappedInput, &QQuickTextInput::echoModeChanged, input, [ input ] { Q_EMIT input->echoModeChanged( input->echoMode() ); } ); @@ -615,6 +618,18 @@ Qt::Alignment QskTextInput::alignment() const return alignmentHint( Text, Qt::AlignLeft | Qt::AlignTop ); } +void QskTextInput::setWrapMode( QskTextOptions::WrapMode wrapMode ) +{ + m_data->textInput->setWrapMode( + static_cast< QQuickTextInput::WrapMode >( wrapMode ) ); +} + +QskTextOptions::WrapMode QskTextInput::wrapMode() const +{ + return static_cast< QskTextOptions::WrapMode >( + m_data->textInput->wrapMode() ); +} + QFont QskTextInput::font() const { return effectiveFont( QskTextInput::Text ); diff --git a/src/controls/QskTextInput.h b/src/controls/QskTextInput.h index de64d109..3aae8c05 100644 --- a/src/controls/QskTextInput.h +++ b/src/controls/QskTextInput.h @@ -7,6 +7,7 @@ #define QSK_TEXT_INPUT_H #include "QskControl.h" +#include "QskTextOptions.h" class QValidator; class QskFontRole; @@ -26,7 +27,10 @@ class QSK_EXPORT QskTextInput : public QskControl Q_PROPERTY( QFont font READ font ) Q_PROPERTY( Qt::Alignment alignment READ alignment - WRITE setAlignment NOTIFY alignmentChanged ) + WRITE setAlignment RESET resetAlignment NOTIFY alignmentChanged ) + + Q_PROPERTY( QskTextOptions::WrapMode wrapMode READ wrapMode + WRITE setWrapMode NOTIFY wrapModeChanged ) Q_PROPERTY( ActivationModes activationModes READ activationModes WRITE setActivationModes NOTIFY activationModesChanged ) @@ -102,6 +106,9 @@ class QSK_EXPORT QskTextInput : public QskControl void resetAlignment(); Qt::Alignment alignment() const; + void setWrapMode( QskTextOptions::WrapMode ); + QskTextOptions::WrapMode wrapMode() const; + void setActivationModes( ActivationModes ); ActivationModes activationModes() const; @@ -174,6 +181,7 @@ class QSK_EXPORT QskTextInput : public QskControl void fontRoleChanged(); void alignmentChanged(); + void wrapModeChanged( QskTextOptions::WrapMode ); void overwriteModeChanged( bool ); void maximumLengthChanged( int );