[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Caolán McNamara]

 vcl/source/control/spinfld.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1b1a2703aeea3c81e2153b04e2f4685f9840819a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 18 12:01:44 2016 +0100

    Resolves: tdf#97065 gtk3: Date field displayed incomplete
    
    a spinfield with a dropdown is sort of weird, we should
    probably revisit this and see if SPIN and DROPDOWN
    are mutually exclusive and for DROPDOWN use ComboBox styles
    
    (cherry picked from commit 276732f3068cac65dd607b4f78abdcd918ed30ad)
    
    Change-Id: Id7f5c54974dc2dfd63ab30df18e14f6a67a8ea90
    Reviewed-on: https://gerrit.libreoffice.org/30005
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index c8a601d..246f5a6 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -738,7 +738,9 @@ void SpinField::Resize()
 
             // adjust position and size of the edit field
             if (GetNativeControlRegion(CTRL_SPINBOX, PART_SUB_EDIT, aArea, ControlState::NONE,
-                                       aControlValue, OUString(), aBound, aContent))
+                                       aControlValue, OUString(), aBound, aContent) &&
+                // there is just no useful native support for spinfields with dropdown
+                !(GetStyle() & WB_DROPDOWN))
             {
                 // convert back from border space to local coordinates
                 aPoint = pBorder->ScreenToOutputPixel(OutputToScreenPixel(aPoint));