[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit afe3205efb82447e49851c239334fe84692dec4f
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Nov 18 00:34:43 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Nov 18 09:47:29 2019 +0100

    widget theme: correct sizes of combobox/listbox
    
    Combobox/listbox was clipped on the right side. Fixed this by
    increasing the size of the widget by one and moving the button to
    the right by one pixel.
    
    Change-Id: If73e93d0c99c1daff9c0bab095169dba3c619450
    Reviewed-on: https://gerrit.libreoffice.org/83043
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 9e7a0fc1573a95a1542207ac86a18e630c1fc835)
    Reviewed-on: https://gerrit.libreoffice.org/83055
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 1f7f13098ae7..4b913fa495d4 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -899,8 +899,8 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
             if (ePart == ControlPart::ButtonDown)
             {
                 Point aPoint(aLocation.X() + rBoundingControlRegion.GetWidth()
-                                 - aComboButtonSize.Width(),
-                             aLocation.Y() + 1);
+                                 - aComboButtonSize.Width() - 1,
+                             aLocation.Y());
                 rNativeContentRegion = tools::Rectangle(aPoint, aComboButtonSize);
                 rNativeBoundingRegion = rNativeContentRegion;
                 return true;
@@ -918,7 +918,7 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
                 Size aSize(rBoundingControlRegion.GetWidth(), aComboButtonSize.Height());
                 rNativeContentRegion = tools::Rectangle(aLocation, aSize);
                 rNativeBoundingRegion = rNativeContentRegion;
-                rNativeBoundingRegion.expand(1);
+                rNativeBoundingRegion.expand(2);
                 return true;
             }
         }
commit 16ff7dda3c385a33e4078e1bd46f5cf0807888de
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Nov 16 11:01:38 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Nov 18 09:47:23 2019 +0100

    widget theme: allow for default "stacked" spinbuttons
    
    Change-Id: I2943616a641de72a615f57784e8a9927c12edcf7
    Reviewed-on: https://gerrit.libreoffice.org/82979
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 9aab980711f82471b012b1691699d9a28ef836f5)
    Reviewed-on: https://gerrit.libreoffice.org/83054
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 8a3b43fddaf1..1f7f13098ae7 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -738,9 +738,14 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 
             auto const& pEntirePart
                 = m_pWidgetDefinition->getDefinition(eType, ControlPart::Entire);
+
             OString sOrientation = pEntirePart->msOrientation;
 
-            if (sOrientation.isEmpty() || sOrientation == "decrease-edit-increase")
+            if (sOrientation.isEmpty() || sOrientation == "stacked")
+            {
+                return false;
+            }
+            else if (sOrientation == "decrease-edit-increase")
             {
                 if (ePart == ControlPart::ButtonUp)
                 {