[Libreoffice-commits] core.git: vcl/unx

Alex McMurchy1917 mcmurchy1917-libreoffice at yahoo.co.uk
Wed Jul 4 00:50:31 UTC 2018


 vcl/unx/kde4/KDESalGraphics.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 585415df64f226503b52d1e2b7971a9c46eb6917
Author: Alex McMurchy1917 <mcmurchy1917-libreoffice at yahoo.co.uk>
Date:   Tue Jun 26 09:38:59 2018 +0100

    tdf#115718 Fix Watch Window EditBox
    
    For KDE4 only: this change reintroduces QStyle::PE_PanelLineEdit for
    the EditBox/LineEdit widget. This allows the contents of the
    Watch Window EditBox to be amended as one would expect.
    
    Change-Id: Iffd7498d5f553ac0c9c612bf36b9f23d9eb8f86d
    Reviewed-on: https://gerrit.libreoffice.org/56447
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index a4ad88117f57..8c0238c95acc 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -408,7 +408,12 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         draw( QStyle::PE_IndicatorToolBarHandle, &option, m_image.get(),
               vclStateValue2StateFlag(nControlState, value), rect );
     }
-    else if (type == ControlType::Editbox || type == ControlType::MultilineEditbox)
+    else if (type == ControlType::Editbox)
+    {
+        lcl_drawFrame( QStyle::PE_PanelLineEdit, m_image.get(),
+             vclStateValue2StateFlag(nControlState, value));
+    }
+    else if (type == ControlType::MultilineEditbox)
     {
         lcl_drawFrame( QStyle::PE_FrameLineEdit, m_image.get(),
                        vclStateValue2StateFlag(nControlState, value));


More information about the Libreoffice-commits mailing list