diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-04 18:39:34 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-05-31 15:32:00 +0200 |
| commit | 2650a973ced3f1aef8169dd49bde2645a7eb2c03 (patch) | |
| tree | 8992ef51c1fe10984cf7cecfc6c284fc5992b077 | |
| parent | 062a31fb26e0262e29f31850664479e5df20cc67 (diff) | |
Resolves: tdf#108111 backport mono checkboxes fix
replace the blue which will be set to transparent, with transparent
and then we don't "manually" replace a color with transparent which
makes tdf#108111 look right again
(cherry picked from commit f1a8e00764b32c3b799ecd40dcb4dd632493bc45)
Change-Id: I95923685d412145e88b672a50311c767d1425493
Reviewed-on: https://gerrit.libreoffice.org/38223
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ec49295718144aeeb81683bcfe5923c3610e8d21)
| -rw-r--r-- | icon-themes/elementary/vcl/res/check.png | bin | 478 -> 488 bytes | |||
| -rw-r--r-- | icon-themes/elementary/vcl/res/checkmono.png | bin | 476 -> 476 bytes | |||
| -rw-r--r-- | icon-themes/elementary/vcl/res/radio.png | bin | 393 -> 452 bytes | |||
| -rw-r--r-- | icon-themes/elementary/vcl/res/radiomono.png | bin | 437 -> 450 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/vcl/res/check.png | bin | 478 -> 488 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/vcl/res/checkmono.png | bin | 476 -> 476 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/vcl/res/radio.png | bin | 393 -> 452 bytes | |||
| -rw-r--r-- | icon-themes/galaxy/vcl/res/radiomono.png | bin | 437 -> 450 bytes | |||
| -rw-r--r-- | vcl/source/control/button.cxx | 4 |
9 files changed, 1 insertions, 3 deletions
diff --git a/icon-themes/elementary/vcl/res/check.png b/icon-themes/elementary/vcl/res/check.png Binary files differindex daeddd2ddcca..05f8b1c381c3 100644 --- a/icon-themes/elementary/vcl/res/check.png +++ b/icon-themes/elementary/vcl/res/check.png diff --git a/icon-themes/elementary/vcl/res/checkmono.png b/icon-themes/elementary/vcl/res/checkmono.png Binary files differindex 69c89139bf49..dc8888e0442c 100644 --- a/icon-themes/elementary/vcl/res/checkmono.png +++ b/icon-themes/elementary/vcl/res/checkmono.png diff --git a/icon-themes/elementary/vcl/res/radio.png b/icon-themes/elementary/vcl/res/radio.png Binary files differindex 73e2a04c474c..dff083949b97 100644 --- a/icon-themes/elementary/vcl/res/radio.png +++ b/icon-themes/elementary/vcl/res/radio.png diff --git a/icon-themes/elementary/vcl/res/radiomono.png b/icon-themes/elementary/vcl/res/radiomono.png Binary files differindex d9e447102afd..cdee168c1351 100644 --- a/icon-themes/elementary/vcl/res/radiomono.png +++ b/icon-themes/elementary/vcl/res/radiomono.png diff --git a/icon-themes/galaxy/vcl/res/check.png b/icon-themes/galaxy/vcl/res/check.png Binary files differindex 3bf35b2d6ae5..05f8b1c381c3 100644 --- a/icon-themes/galaxy/vcl/res/check.png +++ b/icon-themes/galaxy/vcl/res/check.png diff --git a/icon-themes/galaxy/vcl/res/checkmono.png b/icon-themes/galaxy/vcl/res/checkmono.png Binary files differindex 4cabe1284025..afdf871f4fe9 100644 --- a/icon-themes/galaxy/vcl/res/checkmono.png +++ b/icon-themes/galaxy/vcl/res/checkmono.png diff --git a/icon-themes/galaxy/vcl/res/radio.png b/icon-themes/galaxy/vcl/res/radio.png Binary files differindex c198a6d9ef90..dff083949b97 100644 --- a/icon-themes/galaxy/vcl/res/radio.png +++ b/icon-themes/galaxy/vcl/res/radio.png diff --git a/icon-themes/galaxy/vcl/res/radiomono.png b/icon-themes/galaxy/vcl/res/radiomono.png Binary files differindex aba237e266d2..88f101430b82 100644 --- a/icon-themes/galaxy/vcl/res/radiomono.png +++ b/icon-themes/galaxy/vcl/res/radiomono.png diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 2feddafde72a..6c46e52137e0 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2764,10 +2764,8 @@ static void LoadThemedImageList (const StyleSettings &rStyleSettings, aColorAry2[4] = rStyleSettings.GetDarkShadowColor(); aColorAry2[5] = rStyleSettings.GetWindowTextColor(); - Color aMaskColor(0x00, 0x00, 0xFF ); static_assert( sizeof(aColorAry1) == sizeof(aColorAry2), "aColorAry1 must match aColorAry2" ); - // FIXME: do we want the mask for the checkbox ? - pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor, + pList->InsertFromHorizontalBitmap (rResId, nImages, nullptr, aColorAry1, aColorAry2, SAL_N_ELEMENTS(aColorAry1)); } |
