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

[Caolán McNamara]

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

New commits:
commit 276732f3068cac65dd607b4f78abdcd918ed30ad
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
    
    Change-Id: Id7f5c54974dc2dfd63ab30df18e14f6a67a8ea90

diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 40c2954..395b0c2 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -715,7 +715,9 @@ void SpinField::Resize()
 
             // adjust position and size of the edit field
             if (GetNativeControlRegion(ControlType::Spinbox, ControlPart::SubEdit, 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));