diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-02-19 14:17:54 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-08-29 20:10:49 +0900 |
| commit | 58835cd41667bc29ed5dd87700932cad30ae96a3 (patch) | |
| tree | 99de33d0c90949bb7d8778ac939ae48739137373 /vcl | |
| parent | 26dd15be08627ae644e888d16d46cdde56d35e5a (diff) | |
Draw basic fixedline from the theme definition
Change-Id: I791d33e4cea14f49609434e39f681cf47864fc67
Reviewed-on: https://gerrit.libreoffice.org/68750
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 16d9cfe92a60e3a7ea238ef4a656e5277231b866)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 20 | ||||
| -rw-r--r-- | vcl/source/gdi/WidgetDefinitionReader.cxx | 3 | ||||
| -rw-r--r-- | vcl/uiconfig/theme_definitions/definition.xml | 13 |
3 files changed, 34 insertions, 2 deletions
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx index 317cb3455641..14477ef40ec5 100644 --- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx +++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx @@ -82,8 +82,8 @@ bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr return false; return true; case ControlType::Slider: - return true; case ControlType::Fixedline: + return true; case ControlType::Toolbar: case ControlType::Menubar: case ControlType::MenuPopup: @@ -453,6 +453,24 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart } break; case ControlType::Fixedline: + { + std::shared_ptr<WidgetDefinitionPart> pPart + = m_aWidgetDefinition.getDefinition(eType, ePart); + if (pPart) + { + auto aStates = pPart->getStates(eState, rValue); + if (!aStates.empty()) + { + std::shared_ptr<WidgetDefinitionState> pState = aStates.back(); + { + munchDrawCommands(pState->mpDrawCommands, m_rGraphics, nX, nY, nWidth, + nHeight); + bOK = true; + } + } + } + } + break; case ControlType::Toolbar: case ControlType::Menubar: break; diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx index 9e4ed46f6f36..8be78889e990 100644 --- a/vcl/source/gdi/WidgetDefinitionReader.cxx +++ b/vcl/source/gdi/WidgetDefinitionReader.cxx @@ -136,7 +136,8 @@ bool getControlTypeForXmlString(OString const& rString, ControlType& reType) = { { "pushbutton", ControlType::Pushbutton }, { "radiobutton", ControlType::Radiobutton }, { "checkbox", ControlType::Checkbox }, { "combobox", ControlType::Combobox }, { "editbox", ControlType::Editbox }, { "scrollbar", ControlType::Scrollbar }, - { "spinbox", ControlType::Spinbox }, { "slider", ControlType::Slider } }; + { "spinbox", ControlType::Spinbox }, { "slider", ControlType::Slider }, + { "fixedline", ControlType::Fixedline } }; auto const& rIterator = aPartMap.find(rString); if (rIterator != aPartMap.end()) diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml index e57404c94013..8adfc76ae6b1 100644 --- a/vcl/uiconfig/theme_definitions/definition.xml +++ b/vcl/uiconfig/theme_definitions/definition.xml @@ -201,4 +201,17 @@ </part> </slider> + <fixedline> + <part value="SeparatorHorz"> + <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any"> + <line stroke="#007AFF" fill="#007AFF" stroke-width="2" x1="0.0" y1="0.5" x2="1.0" y2="0.5"/> + </state> + </part> + <part value="SeparatorVert"> + <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any"> + <line stroke="#007AFF" fill="#007AFF" stroke-width="2" x1="0.5" y1="0.0" x2="0.5" y2="1.0"/> + </state> + </part> + </fixedline> + </widgets> |