diff options
-rw-r--r-- | src/gui/kernel/qinputpanel.cpp | 29 | ||||
-rw-r--r-- | src/gui/kernel/qinputpanel.h | 24 | ||||
-rw-r--r-- | src/gui/kernel/qinputpanel_p.h | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 4 |
5 files changed, 32 insertions, 31 deletions
diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp index 36104f3816..f8d98d071f 100644 --- a/src/gui/kernel/qinputpanel.cpp +++ b/src/gui/kernel/qinputpanel.cpp @@ -86,10 +86,11 @@ void QInputPanel::setInputItemTranform(const QTransform &transform) { Q_D(QInputPanel); d->inputItemTransform = transform; - emit cursorRectChanged(); + emit cursorRectangleChanged(); + emit keyboardRectangleChanged(); } -QRectF QInputPanel::cursorRect() const +QRectF QInputPanel::cursorRectangle() const { QInputMethodQueryEvent query(Qt::ImMicroFocus); QGuiApplication::sendEvent(inputItem(), &query); @@ -101,7 +102,7 @@ QRectF QInputPanel::cursorRect() const return d->inputItemTransform.mapRect(r); } -QRectF QInputPanel::keyboardRect() +QRectF QInputPanel::keyboardRectangle() { QPlatformInputContext *ic = QGuiApplicationPrivate::platformIntegration()->inputContext(); if (ic) @@ -109,31 +110,31 @@ QRectF QInputPanel::keyboardRect() return QRectF(); } -void QInputPanel::open() +void QInputPanel::show() { - setOpen(true); + setVisible(true); } -void QInputPanel::close() +void QInputPanel::hide() { - setOpen(false); + setVisible(false); } -bool QInputPanel::isOpen() const +bool QInputPanel::visible() const { Q_D(const QInputPanel); - return d->open; + return d->visible; } -void QInputPanel::setOpen(bool open) +void QInputPanel::setVisible(bool visible) { Q_D(QInputPanel); - if (d->open == open) + if (d->visible == visible) return; - d->open = open; - emit openChanged(); + d->visible = visible; + emit visibleChanged(); } bool QInputPanel::isAnimating() const @@ -152,7 +153,7 @@ void QInputPanel::update(Qt::InputMethodQueries queries) ic->update(queries); if (queries & Qt::ImMicroFocus) - emit cursorRectChanged(); + emit cursorRectangleChanged(); } void QInputPanel::reset() diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h index c88edbce36..b0f0e2387b 100644 --- a/src/gui/kernel/qinputpanel.h +++ b/src/gui/kernel/qinputpanel.h @@ -60,9 +60,9 @@ class Q_GUI_EXPORT QInputPanel : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QInputPanel) Q_PROPERTY(QObject *inputItem READ inputItem WRITE setInputItem NOTIFY inputItemChanged) - Q_PROPERTY(QRectF cursorRect READ cursorRect NOTIFY cursorRectChanged) - Q_PROPERTY(QRectF keyboardRect READ keyboardRect NOTIFY keyboardRectChanged) - Q_PROPERTY(bool open READ isOpen WRITE setOpen NOTIFY openChanged) + Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged) + Q_PROPERTY(QRectF keyboardRectangle READ keyboardRectangle NOTIFY keyboardRectangleChanged) + Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged) Q_PROPERTY(bool animating READ isAnimating NOTIFY animatingChanged) public: @@ -76,24 +76,24 @@ public: void setInputItemTranform(const QTransform &transform); // in window coordinates - QRectF cursorRect() const; // ### what if we have rotations for the item? + QRectF cursorRectangle() const; // ### what if we have rotations for the item? // keyboard geometry in window coords - QRectF keyboardRect(); + QRectF keyboardRectangle(); enum Action { Click, ContextMenu }; - bool isOpen() const; - void setOpen(bool open); + bool visible() const; + void setVisible(bool visible); bool isAnimating() const; public Q_SLOTS: - void open(); - void close(); + void show(); + void hide(); void update(Qt::InputMethodQueries queries); void reset(); @@ -102,9 +102,9 @@ public Q_SLOTS: Q_SIGNALS: void inputItemChanged(); - void cursorRectChanged(); - void keyboardRectChanged(); - void openChanged(); + void cursorRectangleChanged(); + void keyboardRectangleChanged(); + void visibleChanged(); void animatingChanged(); private: diff --git a/src/gui/kernel/qinputpanel_p.h b/src/gui/kernel/qinputpanel_p.h index 567459c79e..d081cf4a6e 100644 --- a/src/gui/kernel/qinputpanel_p.h +++ b/src/gui/kernel/qinputpanel_p.h @@ -54,11 +54,11 @@ class QInputPanelPrivate : public QObjectPrivate { public: inline QInputPanelPrivate() - : open(false) + : visible(false) {} QTransform inputItemTransform; QWeakPointer<QObject> inputItem; - bool open; + bool visible; }; QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 8c08c13180..32800833ab 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -75,7 +75,7 @@ QRectF QPlatformInputContext::keyboardRect() const void QPlatformInputContext::emitKeyboardRectChanged() const { - emit qApp->inputPanel()->keyboardRectChanged(); + emit qApp->inputPanel()->keyboardRectangleChanged(); } bool QPlatformInputContext::isAnimating() diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index c9ef2e79d8..25c0e7f8cc 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -4110,10 +4110,10 @@ bool QApplication::notify(QObject *receiver, QEvent *e) break; } case QEvent::RequestSoftwareInputPanel: - inputPanel()->open(); + inputPanel()->show(); break; case QEvent::CloseSoftwareInputPanel: - inputPanel()->close(); + inputPanel()->hide(); break; #ifndef QT_NO_GESTURES |