diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-05-03 21:16:49 +0200 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-05-08 15:17:53 +0200 |
commit | 1b2aaed5e60e4e41f1d3475d6229d893d49bbeb7 (patch) | |
tree | be3387ee7c132768cb65210d3b437ae9a8cd34b4 /vcl | |
parent | 2376db068d8194d3455681a559369e50743e29f3 (diff) |
tdf#123956 Qt5 IM update cursor position
This sets the cursor position to the one provided by the
QInputMethodEvent::Cursor attribute.
Change-Id: I4a99f9939b53c69631e45d41102bf9c7f53f0ff5
Reviewed-on: https://gerrit.libreoffice.org/71782
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 110fd705ad3ae35144aaa6e5d8249b7e35f2825f)
Reviewed-on: https://gerrit.libreoffice.org/71955
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qt5/Qt5Widget.cxx | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx index 62fae3736247..3bc310954cc8 100644 --- a/vcl/qt5/Qt5Widget.cxx +++ b/vcl/qt5/Qt5Widget.cxx @@ -469,10 +469,32 @@ void Qt5Widget::inputMethodEvent(QInputMethodEvent* pEvent) { aInputEvent.maText = toOUString(pEvent->preeditString()); aInputEvent.mnCursorPos = 0; - sal_Int32 nLength = aInputEvent.maText.getLength(); + + const sal_Int32 nLength = aInputEvent.maText.getLength(); + const QList<QInputMethodEvent::Attribute>& rAttrList = pEvent->attributes(); std::vector<ExtTextInputAttr> aTextAttrs(nLength, ExtTextInputAttr::Underline); + + for (int i = 0; i < rAttrList.size(); ++i) + { + const QInputMethodEvent::Attribute& rAttr = rAttrList.at(i); + switch (rAttr.type) + { + case QInputMethodEvent::Cursor: + { + aInputEvent.mnCursorPos = rAttr.start; + if (rAttr.length == 0) + aInputEvent.mnCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE; + break; + } + default: + SAL_WARN("vcl.qt5", "Unhandled QInputMethodEvent attribute: " + << static_cast<int>(rAttr.type)); + break; + } + } if (nLength) aInputEvent.mpTextAttr = &aTextAttrs[0]; + m_pFrame->CallCallback(SalEvent::ExtTextInput, &aInputEvent); pEvent->accept(); } |