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

Michael Meeks michael.meeks at collabora.com
Tue Feb 16 10:34:04 UTC 2016


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

New commits:
commit 7c1ba528722d859bca290c83dc583bb6b8c66099
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Feb 15 15:56:23 2016 +0000

    tdf#97739 - ensure we have a valid rectangle for spin-button controls.
    
    Otherwise OpenGL can't render, cache and diff these; so we loose them.
    
    Change-Id: Iac4f3ee0fc68154f708a881d5e0255fc9f8df62d
    Reviewed-on: https://gerrit.libreoffice.org/22374
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 5f86629..8f4bbca 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -81,7 +81,8 @@ bool ImplDrawNativeSpinfield(vcl::RenderContext& rRenderContext, vcl::Window* pW
             rRenderContext.IsNativeControlSupported(CTRL_SPINBOX, rSpinbuttonValue.mnLowerPart))
         {
             // only paint the embedded spin buttons, all buttons are painted at once
-            bNativeOK = rRenderContext.DrawNativeControl(CTRL_SPINBOX, PART_ALL_BUTTONS, Rectangle(),
+            Rectangle aUpperAndLowerButtons( rSpinbuttonValue.maUpperRect.GetUnion( rSpinbuttonValue.maLowerRect ) );
+            bNativeOK = rRenderContext.DrawNativeControl(CTRL_SPINBOX, PART_ALL_BUTTONS, aUpperAndLowerButtons,
                                                          ControlState::ENABLED, rSpinbuttonValue, OUString());
         }
         else


More information about the Libreoffice-commits mailing list