diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-11 17:08:18 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-12 00:38:24 +0100 |
| commit | fe4da4c2ec02159afe6206db78920e8fde7691d0 (patch) | |
| tree | 0af84d486d0c38e8a63937c8d879132a3a477ead | |
| parent | 7a6e7ed16ed57e131079ee79d06b03141117d9d7 (diff) | |
widget theme: change the tab item height to (min) 32 px
Change-Id: I1919300071a06242fe832880b46c944989daa4b6
Reviewed-on: https://gerrit.libreoffice.org/69057
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 212a40aaf7ec3316d5209b688f5f79821f99fbdc)
| -rw-r--r-- | vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 10 | ||||
| -rw-r--r-- | vcl/uiconfig/theme_definitions/definition.xml | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx index a15010014aa4..06b85f9a2928 100644 --- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx +++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx @@ -775,10 +775,12 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion( if (!pPart) return false; - rNativeBoundingRegion = tools::Rectangle( - rBoundingControlRegion.TopLeft(), - Size(rBoundingControlRegion.GetWidth() + pPart->mnMarginWidth, - rBoundingControlRegion.GetHeight() + pPart->mnMarginHeight)); + long nWidth = std::max(rBoundingControlRegion.GetWidth() + pPart->mnMarginWidth, + long(pPart->mnWidth)); + long nHeight = std::max(rBoundingControlRegion.GetHeight() + pPart->mnMarginHeight, + long(pPart->mnHeight)); + + rNativeBoundingRegion = tools::Rectangle(aLocation, Size(nWidth, nHeight)); rNativeContentRegion = rNativeBoundingRegion; return true; } diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml index e91953109554..5a4be114ea97 100644 --- a/vcl/uiconfig/theme_definitions/definition.xml +++ b/vcl/uiconfig/theme_definitions/definition.xml @@ -320,7 +320,7 @@ </progress> <tabitem> - <part value="Entire" margin-width="20" margin-height="6"> + <part value="Entire" margin-width="8" height="32"> <state selected="false" extra="first"> <external source="tabitem-first.svgx" /> </state> |