[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svtools/source vcl/source

[Tor Lillqvist (via logerrit)]

 svtools/source/config/accessibilityoptions.cxx |    4 ++++
 vcl/source/app/settings.cxx                    |    9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 6abd526731eb90bf1cb56260c3617729041dd578
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 20 17:32:25 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 18 08:42:03 2020 +0200

    tdf#126966: Make the colour swatches larger on iOS
    
    We reduce the number of swatches per row from 12 to 4 and increase
    their size suitably so that the thing still fits in the sidebar in the
    iOS app on an iPad in portrait orientation.
    
    Change-Id: Ie81e5b54e88a02c6866de27448b5be72e97d9a16
    Reviewed-on: https://gerrit.libreoffice.org/85620
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 18af8dc6a038d1e76274de7abc55ffa06b39a6c8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94211
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 6cd499a08e6d..315a0333b7b7 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -261,6 +261,9 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
 
 sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
 {
+#ifdef IOS
+    return 4;
+#else
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
     sal_Int16 nRet = 12;
 
@@ -275,6 +278,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
     }
 
     return nRet;
+#endif
 }
 
 bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index a621f6c61fd4..66195762b6e1 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -472,8 +472,15 @@ ImplStyleData::ImplStyleData() :
     maEdgeBlendingTopLeftColor(Color(0xC0, 0xC0, 0xC0)),
     maEdgeBlendingBottomRightColor(Color(0x40, 0x40, 0x40)),
     mnListBoxMaximumLineCount(25),
+    // For some reason this isn't actually the column count that gets used, at least on iOS, but
+    // instead what SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() in
+    // svtools/source/config/accessibilityoptions.cxx returns.
     mnColorValueSetColumnCount(12),
+#ifdef IOS
+    maListBoxPreviewDefaultLogicSize(Size(30, 30)),
+#else
     maListBoxPreviewDefaultLogicSize(Size(15, 7)),
+#endif
     maListBoxPreviewDefaultPixelSize(Size(0, 0)), // on-demand calculated in GetListBoxPreviewDefaultPixelSize(),
     mbPreviewUsesCheckeredBackground(true)
 {