[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - icon-themes/colibre sfx2/inc sfx2/source

[Tor Lillqvist (via logerrit)]

 icon-themes/colibre/sfx2/res/symphony/morebutton-large.png |binary
 sfx2/inc/bitmaps.hlst                                      |    1 +
 sfx2/source/sidebar/Theme.cxx                              |    6 ++++++
 3 files changed, 7 insertions(+)

New commits:
commit f123dcaade9236dc5af3280cf5bde4a9166de66c
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Oct 23 14:44:40 2019 +0300
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Nov 25 12:55:20 2019 +0100

    tdf#127878: Use a larger "morebutton" image on iOS
    
    Change-Id: Ifbd1b92a6921f7a283c3a7e288fbf05fbc2453eb
    Reviewed-on: https://gerrit.libreoffice.org/81379
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Tested-by: Tor Lillqvist <t...@collabora.com>
    (cherry picked from commit 89a620a7dfdd3b881a620568b82ef68e96b51c92)
    Reviewed-on: https://gerrit.libreoffice.org/83659
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/icon-themes/colibre/sfx2/res/symphony/morebutton-large.png 
b/icon-themes/colibre/sfx2/res/symphony/morebutton-large.png
new file mode 100644
index 000000000000..550d511c96f4
Binary files /dev/null and 
b/icon-themes/colibre/sfx2/res/symphony/morebutton-large.png differ
diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index c420ba89bd78..a1ddf8de0cbc 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -36,6 +36,7 @@
 #define GRIP                                "sfx2/res/grip.png"
 #define OPEN_MORE                           "sfx2/res/symphony/open_more.png"
 #define MOREBUTTON                          "sfx2/res/symphony/morebutton.png"
+#define MOREBUTTON_LARGE                    
"sfx2/res/symphony/morebutton-large.png"
 #define SIDEBAR_3D_LARGE                    
"sfx2/res/symphony/sidebar-3d-large.png"
 #define SIDEBAR_3D_SMALL                    
"sfx2/res/symphony/sidebar-3d-small.png"
 #define SIDEBAR_ANIMATION_LARGE             
"sfx2/res/symphony/sidebar-animation-large.png"
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index a6587a493a50..ad64a420f694 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -292,9 +292,15 @@ void Theme::UpdateTheme()
         setPropertyValue(
             maPropertyIdToNameMap[Image_TabBarMenu],
             
Any(OUString("private:graphicrepository/sfx2/res/symphony/open_more.png")));
+#ifdef IOS
+        setPropertyValue(
+            maPropertyIdToNameMap[Image_PanelMenu],
+            
Any(OUString("private:graphicrepository/sfx2/res/symphony/morebutton-large.png")));
+#else
         setPropertyValue(
             maPropertyIdToNameMap[Image_PanelMenu],
             
Any(OUString("private:graphicrepository/sfx2/res/symphony/morebutton.png")));
+#endif
         setPropertyValue(
             maPropertyIdToNameMap[Image_Closer],
             Any(OUString("private:graphicrepository/sfx2/res/closedoc.png")));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits