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

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: 's avatarTomaž Vajngerl <quikee@gmail.com>
üst cdabde59
...@@ -728,10 +728,13 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion( ...@@ -728,10 +728,13 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
case ControlType::EditboxNoBorder: case ControlType::EditboxNoBorder:
case ControlType::MultilineEditbox: case ControlType::MultilineEditbox:
{ {
//auto const& pPart = m_aWidgetDefinition.getDefinition(eType, ControlPart::Entire); sal_Int32 nHeight = rBoundingControlRegion.GetHeight();
Size aSize(rBoundingControlRegion.GetWidth(), auto const& pPart = m_pWidgetDefinition->getDefinition(eType, ControlPart::Entire);
std::max(rBoundingControlRegion.GetHeight(), 32L)); if (pPart)
nHeight = std::max(nHeight, pPart->mnHeight);
Size aSize(rBoundingControlRegion.GetWidth(), nHeight);
rNativeContentRegion = tools::Rectangle(aLocation, aSize); rNativeContentRegion = tools::Rectangle(aLocation, aSize);
rNativeBoundingRegion = rNativeContentRegion; rNativeBoundingRegion = rNativeContentRegion;
rNativeBoundingRegion.expand(2); rNativeBoundingRegion.expand(2);
......
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</combobox> </combobox>
<editbox> <editbox>
<part value="Entire"> <part value="Entire" height="32">
<state enabled="true"> <state enabled="true">
<external source="common-rect.svgx" /> <external source="common-rect.svgx" />
</state> </state>
......
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