Kaydet (Commit) 322dd37c authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl

Fixes, don't draw IntroProgress, adjust EditBox bounding size

Change-Id: I1d1944faed05ec3753709e39fa1a820d795e26d5
Reviewed-on: https://gerrit.libreoffice.org/68862
Tested-by: Jenkins
Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst 50ffab5f
...@@ -60,6 +60,7 @@ FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics) ...@@ -60,6 +60,7 @@ FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
pSVData->maNWFData.mbCenteredTabs = true; pSVData->maNWFData.mbCenteredTabs = true;
pSVData->maNWFData.mbProgressNeedsErase = true; pSVData->maNWFData.mbProgressNeedsErase = true;
pSVData->maNWFData.mnStatusBarLowerRightOffset = 10; pSVData->maNWFData.mnStatusBarLowerRightOffset = 10;
pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
} }
bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, ControlPart ePart) bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, ControlPart ePart)
...@@ -107,8 +108,8 @@ bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr ...@@ -107,8 +108,8 @@ bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
case ControlType::MenuPopup: case ControlType::MenuPopup:
return false; return false;
case ControlType::Progress: case ControlType::Progress:
case ControlType::IntroProgress:
return true; return true;
case ControlType::IntroProgress:
case ControlType::Tooltip: case ControlType::Tooltip:
return false; return false;
case ControlType::WindowBackground: case ControlType::WindowBackground:
...@@ -399,10 +400,6 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart ...@@ -399,10 +400,6 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
switch (eType) switch (eType)
{ {
case ControlType::Generic:
{
}
break;
case ControlType::Pushbutton: case ControlType::Pushbutton:
{ {
/*bool bIsAction = false; /*bool bIsAction = false;
...@@ -530,11 +527,11 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart ...@@ -530,11 +527,11 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
case ControlType::MenuPopup: case ControlType::MenuPopup:
break; break;
case ControlType::Progress: case ControlType::Progress:
case ControlType::IntroProgress:
{ {
bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, nWidth, nHeight); bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, nWidth, nHeight);
} }
break; break;
case ControlType::IntroProgress:
case ControlType::Tooltip: case ControlType::Tooltip:
break; break;
case ControlType::WindowBackground: case ControlType::WindowBackground:
...@@ -693,6 +690,15 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion( ...@@ -693,6 +690,15 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
rNativeContentRegion = rNativeBoundingRegion; rNativeContentRegion = rNativeBoundingRegion;
return true; return true;
} }
case ControlType::Editbox:
case ControlType::EditboxNoBorder:
case ControlType::MultilineEditbox:
{
rNativeBoundingRegion = rBoundingControlRegion;
rNativeContentRegion = rBoundingControlRegion;
return true;
}
default: default:
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment