loleaflet/src/control/ColorPicker.js |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 6dc92fb8122aa0c283f84dc0ce7d1ee98ac8640b
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Feb 6 18:46:02 2020 +0000
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Feb 6 21:25:43 2020 +0100

    select a new color as you switch tint palette.
    
    Change-Id: I4c17e5e88c1263217448fc9b23d223413d788512
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88135
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/loleaflet/src/control/ColorPicker.js 
b/loleaflet/src/control/ColorPicker.js
index ea830bd94..153356f65 100644
--- a/loleaflet/src/control/ColorPicker.js
+++ b/loleaflet/src/control/ColorPicker.js
@@ -243,12 +243,17 @@ L.ColorPicker = L.Class.extend({
                        return;
                this._selectedBasicColorIndex = 
this._updateSelectedSample(basicColorIndex, this._selectedBasicColorIndex, 
L.ColorPicker.BASIC_COLOR);
                this._updateTintsView(basicColorIndex);
+               this._selectTintIndex(3);
        },
 
        onClickTintSample: function (e) {
                var tintIndex = this._extractTintIndex(e.id);
                if (tintIndex < 0)
                        return;
+               this._selectTintIndex(tintIndex);
+       },
+
+       _selectTintIndex: function (tintIndex) {
                this._selectedTintIndex = this._updateSelectedSample(tintIndex, 
this._selectedTintIndex, L.ColorPicker.TINT);
                this._selectedColor = '#' + 
this._getColorCode(this._selectedTintIndex, L.ColorPicker.TINT);
                this._updateNoColorControl(false);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to