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

[Libreoffice Gerrit user]

 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |    9 ++++++---
 vcl/uiconfig/theme_definitions/definition.xml |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3ae8b9301fa817968f3115639bc8a5f2170d179e
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Mar 10 17:26:29 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sun Mar 10 21:55:39 2019 +0100

    widget theme: support "height" for editbox and set to "32"
    
    Change-Id: Iff48c83b6f1b28bc7fbf7646c399a844a3155970
    Reviewed-on: https://gerrit.libreoffice.org/69012
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 4fb2fd315f8d..9085753dbf25 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -728,10 +728,13 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
         case ControlType::EditboxNoBorder:
         case ControlType::MultilineEditbox:
         {
-            //auto const& pPart = m_aWidgetDefinition.getDefinition(eType, ControlPart::Entire);
+            sal_Int32 nHeight = rBoundingControlRegion.GetHeight();
 
-            Size aSize(rBoundingControlRegion.GetWidth(),
-                       std::max(rBoundingControlRegion.GetHeight(), 32L));
+            auto const& pPart = m_pWidgetDefinition->getDefinition(eType, ControlPart::Entire);
+            if (pPart)
+                nHeight = std::max(nHeight, pPart->mnHeight);
+
+            Size aSize(rBoundingControlRegion.GetWidth(), nHeight);
             rNativeContentRegion = tools::Rectangle(aLocation, aSize);
             rNativeBoundingRegion = rNativeContentRegion;
             rNativeBoundingRegion.expand(2);
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 027b78e5fd6e..848f0e600d89 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -147,7 +147,7 @@
     </combobox>
 
     <editbox>
-        <part value="Entire">
+        <part value="Entire" height="32">
             <state enabled="true">
                 <external source="common-rect.svgx" />
             </state>