diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-03 13:35:24 +0100 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-03-11 12:12:58 +0100 |
commit | 3e33a8bb115d7d33d58a09ee3ac7a70c7f931882 (patch) | |
tree | f3471dbde5a99a782efe5de6bf63966d18e2ad86 | |
parent | ffbf5310d21aef52d6dab5de7356e68abac76bad (diff) |
Fixes, don't draw IntroProgress, adjust EditBox bounding size
Change-Id: I1d1944faed05ec3753709e39fa1a820d795e26d5
Reviewed-on: https://gerrit.libreoffice.org/68862
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 322dd37c5297b89cc9a1874dc650d79491a938b0)
-rw-r--r-- | vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx index bbb32a7acec9..33d139e1fc21 100644 --- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx +++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx @@ -60,6 +60,7 @@ FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics) pSVData->maNWFData.mbCenteredTabs = true; pSVData->maNWFData.mbProgressNeedsErase = true; pSVData->maNWFData.mnStatusBarLowerRightOffset = 10; + pSVData->maNWFData.mbCanDrawWidgetAnySize = true; } bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, ControlPart ePart) @@ -107,8 +108,8 @@ bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr case ControlType::MenuPopup: return false; case ControlType::Progress: - case ControlType::IntroProgress: return true; + case ControlType::IntroProgress: case ControlType::Tooltip: return false; case ControlType::WindowBackground: @@ -399,10 +400,6 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart switch (eType) { - case ControlType::Generic: - { - } - break; case ControlType::Pushbutton: { /*bool bIsAction = false; @@ -530,11 +527,11 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart case ControlType::MenuPopup: break; case ControlType::Progress: - case ControlType::IntroProgress: { bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, nWidth, nHeight); } break; + case ControlType::IntroProgress: case ControlType::Tooltip: break; case ControlType::WindowBackground: @@ -693,6 +690,15 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion( rNativeContentRegion = rNativeBoundingRegion; return true; } + case ControlType::Editbox: + case ControlType::EditboxNoBorder: + case ControlType::MultilineEditbox: + { + rNativeBoundingRegion = rBoundingControlRegion; + rNativeContentRegion = rBoundingControlRegion; + return true; + } + default: break; } |