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

[Libreoffice Gerrit user]

 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |    8 ++++++--
 vcl/uiconfig/theme_definitions/definition.xml |    8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 27b43f1dc45d7f3bec99ccbdc96e334c7f967fbc
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Mar 7 14:16:34 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Mar 7 21:22:44 2019 +0100

    widget theme - update editbox, draw from svg
    
    Change-Id: I0dfdaaf74c9b31ecd9b1de511b48dacf2e90f59f
    Reviewed-on: https://gerrit.libreoffice.org/68866
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 54aa111431d9..606417ac1ca5 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -701,8 +701,12 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
         case ControlType::EditboxNoBorder:
         case ControlType::MultilineEditbox:
         {
-            rNativeBoundingRegion = rBoundingControlRegion;
-            rNativeContentRegion = rBoundingControlRegion;
+            //auto const& pPart = m_aWidgetDefinition.getDefinition(eType, ControlPart::Entire);
+
+            Size aSize(rBoundingControlRegion.GetWidth(),
+                       std::max(rBoundingControlRegion.GetHeight(), 32L));
+            rNativeContentRegion = tools::Rectangle(aLocation, aSize);
+            rNativeBoundingRegion = rNativeContentRegion;
             return true;
         }
         break;
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 8c9b1af285d9..0a6f696320b5 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -148,9 +148,11 @@
 
     <editbox>
         <part value="Entire">
-            <state>
-                <rect stroke="#FFFFFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1" />
-                <line stroke="#C7C7C7" stroke-width="2" x1="0.0" y1="0.9" x2="1.0" y2="0.9"/>
+            <state enabled="true">
+                <external source="common-rect.svgx" />
+            </state>
+            <state enabled="false">
+                <external source="common-rect-disabled.svgx" />
             </state>
         </part>
     </editbox>