svx/source/tbxctrls/tbxcolorupdate.cxx | 16 ++++++++++++++-- vcl/source/window/toolbox.cxx | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-)
New commits: commit 467429fe1dd0a7ab62e90234d71c3809ab270159 Author: Marco Cecchetti <marco.cecche...@collabora.com> AuthorDate: Tue Sep 24 16:37:46 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Nov 1 20:37:01 2019 +0100 tdf#126966: Use larger buttons for the colours in the sidebar on iOS - 2 Attempt to merge this with Noel's re-work of the color picker. Change-Id: I9687546889bc20ef95a50aeafbc6f40e939d57a9 Reviewed-on: https://gerrit.libreoffice.org/81755 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/81900 Tested-by: Jenkins diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 2069f61395f8..9465e9aad2f6 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/tbxcolorupdate.hxx> #include <svx/svxids.hrc> #include <svx/xdef.hxx> @@ -89,7 +88,19 @@ namespace svx { Image aImage(mpTbx->GetItemImage(mnBtnId)); Size aItemSize(mbWideButton ? mpTbx->GetItemContentSize(mnBtnId) : aImage.GetSizePixel()); - +#ifdef IOS // tdf#126966 + // Oddly enough, it is in the "not wide button" case that we want the larger ones, hmm. + if (!mbWideButton) + { + // usually the normal size is 16 + const long nIOSSize = 40; + if (aItemSize.getWidth() < nIOSSize) + { + aItemSize.setWidth(nIOSSize); + aItemSize.setHeight(nIOSSize); + } + } +#endif const bool bSizeChanged = (maBmpSize != aItemSize); const bool bDisplayModeChanged = (mbWasHiContrastMode != mpTbx->GetSettings().GetStyleSettings().GetHighContrastMode()); Color aColor(rColor); @@ -100,6 +111,7 @@ namespace svx if ((maCurColor == aColor) && !bSizeChanged && !bDisplayModeChanged && !bForceUpdate) return; + if (!aItemSize.Width() || !aItemSize.Height()) return; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 82640c566927..7d0f56c9e804 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1366,6 +1366,9 @@ bool ToolBox::ImplCalcItem() long nMinWidth = 6; long nMinHeight = 6; long nDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; +#ifdef IOS + nDropDownArrowWidth *= 3; +#endif // set defaults if image or text is needed but empty nDefWidth = GetDefaultImageSize().Width(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits