mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draw basic toolbar from the theme definition

Browse Source 
Change-Id: I4d9935973bb6e46a7c5f17f914944f91a3e10a63
Reviewed-on: https://gerrit.libreoffice.org/68773
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2019-03-02 23:37:02 +01:00
committed by Tomaž Vajngerl
parent c28104e0c2
commit ddc8d51f09
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/source/gdi/FileDefinitionWidgetDraw.cxx
View File

@@ -90,8 +90,8 @@ bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
return true;
case ControlType::Slider:
case ControlType::Fixedline:
return true;
case ControlType::Toolbar:
return true;
case ControlType::Menubar:
case ControlType::MenuPopup:
return false;
@@ -379,6 +379,10 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
}
break;
case ControlType::Toolbar:
{
bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, nWidth, nHeight);
}
break;
case ControlType::Menubar:
break;
case ControlType::MenuPopup:

3
vcl/source/gdi/WidgetDefinitionReader.cxx
View File

@@ -149,7 +149,8 @@ bool getControlTypeForXmlString(OString const& rString, ControlType& reType)
{ "tabpane", ControlType::TabPane },
{ "tabbody", ControlType::TabBody },
{ "frame", ControlType::Frame },
{ "windowbackground", ControlType::WindowBackground } };
{ "windowbackground", ControlType::WindowBackground },
{ "toolbar", ControlType::Toolbar } };
auto const& rIterator = aPartMap.find(rString);
if (rIterator != aPartMap.end())

45
vcl/uiconfig/theme_definitions/definition.xml
View File

@@ -335,4 +335,49 @@
</state>
</part>
</frame>
<toolbar>
<part value="DrawBackgroundHorz">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#FFFFFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
<part value="DrawBackgroundVert">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#FFFFFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
<part value="ThumbHorz">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#00FFFF" fill="#00FFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
<part value="ThumbVert">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#00FFFF" fill="#00FFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
<part value="SeparatorVert">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#00FFFF" fill="#00FFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
<part value="SeparatorHorz">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#00FFFF" fill="#00FFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
<part value="Button">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#00FFFF" fill="#00FFFF" stroke-width="1" rx="1" ry="1"/>
</state>
</part>
</toolbar>
</widgets>