diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-10 17:26:29 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-08-29 20:10:53 +0900 |
| commit | 3d8b12348d5dfa62854884b9fb4c7129cd6568a2 (patch) | |
| tree | e6064021c8fded418242b3ff4806781a102c9135 | |
| parent | 75c700c5f293385289fefdc4fc87a69a9f7f0efb (diff) | |
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@gmail.com>
(cherry picked from commit 3ae8b9301fa817968f3115639bc8a5f2170d179e)
| -rw-r--r-- | vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 9 | ||||
| -rw-r--r-- | vcl/uiconfig/theme_definitions/definition.xml | 2 |
2 files changed, 7 insertions, 4 deletions
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> |