[Libreoffice-commits] core.git: icon-themes/galaxy svx/source

[Regina Henschel]

 icon-themes/galaxy/cmd/bg/lc_backcolor.png     |binary
 icon-themes/galaxy/cmd/lc_extrusion3dcolor.png |binary
 svx/source/tbxctrls/tbxcolorupdate.cxx         |    3 ++-
 3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 98bd643082c6dd037526b6616ed060a3b6aab01f
Author: Regina Henschel <rb.henschel at t-online.de>
Date:   Thu Feb 18 19:39:06 2016 +0100

    tdf#84985 always align color bar to icon bottom edge
    
    The old calculation was one pixel off for icon sizes, which
    are not divisible by 4: galaxy with size 26 and oxygen with
    size 22. The patch does not consider oxygen, because it will
    be dropped.
    
    Change-Id: Ia67facb0bb32dd9112784c2aa864fde252aa6bc3
    Reviewed-on: https://gerrit.libreoffice.org/22488
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/icon-themes/galaxy/cmd/bg/lc_backcolor.png b/icon-themes/galaxy/cmd/bg/lc_backcolor.png
index 52f5acb..bcaa754 100644
Binary files a/icon-themes/galaxy/cmd/bg/lc_backcolor.png and b/icon-themes/galaxy/cmd/bg/lc_backcolor.png differ
diff --git a/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png b/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png
index db38817..d192b80 100644
Binary files a/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png and b/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png differ
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index c0f199a..c773a1c 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -158,7 +158,8 @@ namespace svx
                 }
 
                 if (maBmpSize.Width() == maBmpSize.Height())
-                    maUpdRect = Rectangle(Point( 0, maBmpSize.Height() * 3 / 4), Size(maBmpSize.Width(), maBmpSize.Height() / 4));
+                    // tdf#84985 align color bar with icon bottom edge; integer arithmetic e.g. 26 - 26/4 <> 26 * 3/4
+                    maUpdRect = Rectangle(Point( 0, maBmpSize.Height() - maBmpSize.Height() / 4), Size(maBmpSize.Width(), maBmpSize.Height() / 4));
                 else
                     maUpdRect = Rectangle(Point( maBmpSize.Height() + 2, 2), Point(maBmpSize.Width() - 3, maBmpSize.Height() - 3));