[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/qt5

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Widget.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit ba0e870fe7c9004280e2d3669e89876e1491cc1c
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jan 4 15:40:06 2019 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Sat Jan 19 01:17:26 2019 +0100

    tdf#122459 Qt5 IM underline pre-edit
    
    This simply always underlines the pre-edit text, so it'S easier to
    see what text block is currently IM edited.
    
    Change-Id: I45145e4faa872c44eb6583ac6f335dd40fe3e53e
    Reviewed-on: https://gerrit.libreoffice.org/65856
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit f2ee532640fa200ada55ac51fbe47bad260aec7e)
    Reviewed-on: https://gerrit.libreoffice.org/65858
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 7ca6bd053869a84d18bcce2b3f08a27a6ad785d9)
    Reviewed-on: https://gerrit.libreoffice.org/66612
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 462f19675905..4eaac1629b53 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -41,6 +41,7 @@
 
 #include <cairo.h>
 #include <headless/svpgdi.hxx>
+#include <vcl/commandevent.hxx>
 
 void Qt5Widget::paintEvent(QPaintEvent* pEvent)
 {
@@ -449,6 +450,10 @@ void Qt5Widget::inputMethodEvent(QInputMethodEvent* pEvent)
     {
         aInputEvent.maText = toOUString(pEvent->preeditString());
         aInputEvent.mnCursorPos = 0;
+        sal_Int32 nLength = aInputEvent.maText.getLength();
+        std::vector<ExtTextInputAttr> aTextAttrs(nLength, ExtTextInputAttr::Underline);
+        if (nLength)
+            aInputEvent.mpTextAttr = &aTextAttrs[0];
         m_pFrame->CallCallback(SalEvent::ExtTextInput, &aInputEvent);
         pEvent->accept();
     }