From e239f372c6abcd8371d0a666c828bf1c31195dd4 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 1 Dec 2013 13:24:54 +0200 Subject: fdo#71748 Fix color pickers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit includes the following changes: 1) Remove boxes from PNG files, and draw them ourselves. This will ensure that the color rec will always fit the box. Also it will make all color pickers look the same, and greatly simplify the code. (a part of the code was not reachable anyway.) 2) Fix color preview for toolbar large icons. (a regression of commit f59c47fc1e79050d3342924e6173b0f4b6ddaf02.) 3) Fix sidebar paragraph color picker initial drawing. reset should be called *after* the icon assignment. Change-Id: I13ae02bc3dd68dd14877ccc949784072c58bf211 Reviewed-on: https://gerrit.libreoffice.org/6882 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- icon-themes/galaxy/svx/res/symphony/Line_color.png | Bin 3481 -> 3057 bytes icon-themes/galaxy/svx/res/symphony/fill_color.png | Bin 3517 -> 3240 bytes .../galaxy/svx/res/symphony/sc_backgroundcolor.png | Bin 3625 -> 3240 bytes .../galaxy/svx/res/symphony/sch_backgroundcolor.png | Bin 3410 -> 3042 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'icon-themes/galaxy') diff --git a/icon-themes/galaxy/svx/res/symphony/Line_color.png b/icon-themes/galaxy/svx/res/symphony/Line_color.png index a9522b9eeedd..0e57320662ae 100644 Binary files a/icon-themes/galaxy/svx/res/symphony/Line_color.png and b/icon-themes/galaxy/svx/res/symphony/Line_color.png differ diff --git a/icon-themes/galaxy/svx/res/symphony/fill_color.png b/icon-themes/galaxy/svx/res/symphony/fill_color.png index 1d8837545728..7c44c6e08e1c 100644 Binary files a/icon-themes/galaxy/svx/res/symphony/fill_color.png and b/icon-themes/galaxy/svx/res/symphony/fill_color.png differ diff --git a/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png b/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png index 7f926b66bd71..7c44c6e08e1c 100644 Binary files a/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png and b/icon-themes/galaxy/svx/res/symphony/sc_backgroundcolor.png differ diff --git a/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png b/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png index a2e234fc3311..20e5081aeae8 100644 Binary files a/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png and b/icon-themes/galaxy/svx/res/symphony/sch_backgroundcolor.png differ -- cgit v1.2.3