diff options
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 17 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol_p_p.h | 1 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 52eb4e4078..77b5a4830b 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -112,7 +112,7 @@ static QTextLine currentTextLine(const QTextCursor &cursor) } QWidgetTextControlPrivate::QWidgetTextControlPrivate() - : doc(0), cursorOn(false), blinkingEnabled(true), cursorVisible(false), cursorIsFocusIndicator(false), + : doc(0), cursorOn(false), cursorVisible(false), cursorIsFocusIndicator(false), #ifndef Q_OS_ANDROID interactionFlags(Qt::TextEditorInteraction), #else @@ -691,29 +691,18 @@ void QWidgetTextControlPrivate::setCursorVisible(bool visible) return; cursorVisible = visible; - updateCursorBlinking(); -} - -void QWidgetTextControlPrivate::setBlinkingCursorEnabled(bool enable) -{ - if (blinkingEnabled == enable) - return; - - blinkingEnabled = enable; - if (enable) + if (cursorVisible) connect(qApp->styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetTextControlPrivate::updateCursorBlinking); else disconnect(qApp->styleHints(), &QStyleHints::cursorFlashTimeChanged, this, &QWidgetTextControlPrivate::updateCursorBlinking); - - updateCursorBlinking(); } void QWidgetTextControlPrivate::updateCursorBlinking() { cursorBlinkTimer.stop(); - if (cursorVisible && blinkingEnabled) { + if (cursorVisible) { int flashTime = QGuiApplication::styleHints()->cursorFlashTime(); if (flashTime >= 2) cursorBlinkTimer.start(flashTime / 2, q_func()); diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index e9b3589c5c..fea72d98ff 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -177,7 +177,6 @@ public: QTextDocument *doc; bool cursorOn; - bool blinkingEnabled; bool cursorVisible; QTextCursor cursor; bool cursorIsFocusIndicator; |