diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2016-02-18 19:39:06 +0100 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-18 23:10:56 +0000 |
| commit | 98bd643082c6dd037526b6616ed060a3b6aab01f (patch) | |
| tree | d4d3893f9e0b238ccae6daa4fe91f7ae76c7696b | |
| parent | 06fa2a521b49afe44a387dbfcb65198382f6c57a (diff) | |
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@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
| -rw-r--r-- | icon-themes/galaxy/cmd/bg/lc_backcolor.png | bin | 602 -> 565 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/cmd/lc_extrusion3dcolor.png | bin | 474 -> 599 bytes | |||
| -rw-r--r-- | svx/source/tbxctrls/tbxcolorupdate.cxx | 3 |
3 files changed, 2 insertions, 1 deletions
diff --git a/icon-themes/galaxy/cmd/bg/lc_backcolor.png b/icon-themes/galaxy/cmd/bg/lc_backcolor.png Binary files differindex 52f5acb7d011..bcaa7543b0a6 100644 --- a/icon-themes/galaxy/cmd/bg/lc_backcolor.png +++ b/icon-themes/galaxy/cmd/bg/lc_backcolor.png diff --git a/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png b/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png Binary files differindex db38817eda47..d192b80ccf12 100644 --- a/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png +++ b/icon-themes/galaxy/cmd/lc_extrusion3dcolor.png diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index c0f199aebfc8..c773a1c6ca66 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)); |
