QskTextInput::wrapMode added
This commit is contained in:
parent
7cbf641066
commit
e15f167978
@ -59,6 +59,9 @@ static inline void qskBindSignals(
|
|||||||
QObject::connect( wrappedInput, &QQuickTextInput::maximumLengthChanged,
|
QObject::connect( wrappedInput, &QQuickTextInput::maximumLengthChanged,
|
||||||
input, &QskTextInput::maximumLengthChanged );
|
input, &QskTextInput::maximumLengthChanged );
|
||||||
|
|
||||||
|
QObject::connect( wrappedInput, &QQuickTextInput::wrapModeChanged,
|
||||||
|
input, [ input ] { Q_EMIT input->wrapModeChanged( input->wrapMode() ); } );
|
||||||
|
|
||||||
QObject::connect( wrappedInput, &QQuickTextInput::echoModeChanged,
|
QObject::connect( wrappedInput, &QQuickTextInput::echoModeChanged,
|
||||||
input, [ input ] { Q_EMIT input->echoModeChanged( input->echoMode() ); } );
|
input, [ input ] { Q_EMIT input->echoModeChanged( input->echoMode() ); } );
|
||||||
|
|
||||||
@ -615,6 +618,18 @@ Qt::Alignment QskTextInput::alignment() const
|
|||||||
return alignmentHint( Text, Qt::AlignLeft | Qt::AlignTop );
|
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
|
QFont QskTextInput::font() const
|
||||||
{
|
{
|
||||||
return effectiveFont( QskTextInput::Text );
|
return effectiveFont( QskTextInput::Text );
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#define QSK_TEXT_INPUT_H
|
#define QSK_TEXT_INPUT_H
|
||||||
|
|
||||||
#include "QskControl.h"
|
#include "QskControl.h"
|
||||||
|
#include "QskTextOptions.h"
|
||||||
|
|
||||||
class QValidator;
|
class QValidator;
|
||||||
class QskFontRole;
|
class QskFontRole;
|
||||||
@ -26,7 +27,10 @@ class QSK_EXPORT QskTextInput : public QskControl
|
|||||||
Q_PROPERTY( QFont font READ font )
|
Q_PROPERTY( QFont font READ font )
|
||||||
|
|
||||||
Q_PROPERTY( Qt::Alignment alignment READ alignment
|
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
|
Q_PROPERTY( ActivationModes activationModes READ activationModes
|
||||||
WRITE setActivationModes NOTIFY activationModesChanged )
|
WRITE setActivationModes NOTIFY activationModesChanged )
|
||||||
@ -102,6 +106,9 @@ class QSK_EXPORT QskTextInput : public QskControl
|
|||||||
void resetAlignment();
|
void resetAlignment();
|
||||||
Qt::Alignment alignment() const;
|
Qt::Alignment alignment() const;
|
||||||
|
|
||||||
|
void setWrapMode( QskTextOptions::WrapMode );
|
||||||
|
QskTextOptions::WrapMode wrapMode() const;
|
||||||
|
|
||||||
void setActivationModes( ActivationModes );
|
void setActivationModes( ActivationModes );
|
||||||
ActivationModes activationModes() const;
|
ActivationModes activationModes() const;
|
||||||
|
|
||||||
@ -174,6 +181,7 @@ class QSK_EXPORT QskTextInput : public QskControl
|
|||||||
|
|
||||||
void fontRoleChanged();
|
void fontRoleChanged();
|
||||||
void alignmentChanged();
|
void alignmentChanged();
|
||||||
|
void wrapModeChanged( QskTextOptions::WrapMode );
|
||||||
|
|
||||||
void overwriteModeChanged( bool );
|
void overwriteModeChanged( bool );
|
||||||
void maximumLengthChanged( int );
|
void maximumLengthChanged( int );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user