From 6c3f6fc13a9d6d112253f895d45ea4c9aaab6607 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 20 Dec 2019 17:32:25 +0200 Subject: 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 Reviewed-by: Tor Lillqvist (cherry picked from commit 18af8dc6a038d1e76274de7abc55ffa06b39a6c8) --- vcl/source/app/settings.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'vcl') diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index bf50a8150d47..900dd98d34ff 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) { -- cgit v1.2.3