[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Mar 6 15:36:18 UTC 2019


 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |    6 +++++-
 vcl/source/gdi/WidgetDefinitionReader.cxx     |    5 ++++-
 vcl/uiconfig/theme_definitions/definition.xml |    9 +++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit c34f8f2233212bba7ecca4d128b2ab59b2d1dd6a
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Mar 2 23:40:22 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Wed Mar 6 16:35:53 2019 +0100

    Draw basic list{node,net,header} from the theme definition
    
    Change-Id: I05b2cced0f99d6628a12465748820e3a87c5f3e7
    Reviewed-on: https://gerrit.libreoffice.org/68774
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 9b903a20cd93..15c10a16e1b9 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -106,7 +106,7 @@ bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
         case ControlType::ListNode:
         case ControlType::ListNet:
         case ControlType::ListHeader:
-            return false;
+            return true;
     }
 
     return false;
@@ -404,6 +404,10 @@ bool FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
         case ControlType::ListNode:
         case ControlType::ListNet:
         case ControlType::ListHeader:
+        {
+            bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, nWidth, nHeight);
+        }
+        break;
         default:
             break;
     }
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx
index be0831a4f3c7..12161f00b7cd 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -150,7 +150,10 @@ bool getControlTypeForXmlString(OString const& rString, ControlType& reType)
             { "tabbody", ControlType::TabBody },
             { "frame", ControlType::Frame },
             { "windowbackground", ControlType::WindowBackground },
-            { "toolbar", ControlType::Toolbar } };
+            { "toolbar", ControlType::Toolbar },
+            { "listnode", ControlType::ListNode },
+            { "listnet", ControlType::ListNet },
+            { "listheader", ControlType::ListHeader } };
 
     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 bd0a899d5ec4..ddfe9cdff99d 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -380,4 +380,13 @@
         </part>
     </toolbar>
 
+    <listnode>
+    </listnode>
+
+    <listnet>
+    </listnet>
+
+    <listheader>
+    </listheader>
+
 </widgets>


More information about the Libreoffice-commits mailing list