diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-07 14:16:34 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-11 12:12:59 +0100 |
| commit | ecf3e40777f4f1aa61ab272fba8fb58c93610c6d (patch) | |
| tree | 517d38aaa9fc1a0dcb24d9af61f778a36b6ec65c | |
| parent | fffd40985797d80b4c46591a1f9888cf7aa12da4 (diff) | |
widget theme - update editbox, draw from svg
Change-Id: I0dfdaaf74c9b31ecd9b1de511b48dacf2e90f59f
Reviewed-on: https://gerrit.libreoffice.org/68866
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 27b43f1dc45d7f3bec99ccbdc96e334c7f967fbc)
| -rw-r--r-- | vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 8 | ||||
| -rw-r--r-- | vcl/uiconfig/theme_definitions/definition.xml | 8 |
2 files changed, 11 insertions, 5 deletions
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> |