[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/unx

[Maxim Monastirsky]

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

New commits:
commit f7eaab54fdcafd4220f1585a02da70eba951ead6
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Jan 7 13:03:14 2014 +0200

    fdo#72521 fdo#73103 Fix editable combo-boxes behavior under KDE4
    
    Change-Id: I92a781a1e0f0adcb779155f8c477595e0dd762b1
    Reviewed-on: https://gerrit.libreoffice.org/7287
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Reviewed-on: https://gerrit.libreoffice.org/7462
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 9caeae9..cf72dcd 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -779,7 +779,11 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart p
                     break;
                 }
                 case PART_BUTTON_DOWN:
-                    //the entire control can be used as the "down" button
+                    contentRect = kapp->style()->subControlRect(
+                        QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxArrow );
+
+                    contentRect.translate( boundingRect.left(), boundingRect.top() );
+
                     retVal = true;
                     break;
                 case PART_SUB_EDIT: