From 3c1d8006fcdda210cb646e03fedc305134d876da Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Mar 2023 13:53:12 +0300 Subject: [PATCH] [DE] Select pen when select color in menu --- apps/common/main/lib/view/Draw.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/view/Draw.js b/apps/common/main/lib/view/Draw.js index 650c325380..a4c4ed2be4 100644 --- a/apps/common/main/lib/view/Draw.js +++ b/apps/common/main/lib/view/Draw.js @@ -73,6 +73,11 @@ define([ me.fireEvent('draw:pen', [b]); }); button.on('color:select', function (b, color) { + if (!b.pressed) { + b.toggle(true, true); + me.depressButtons(b); + } + b.options.penOptions.color = color; me.updateButtonHint(b); me.fireEvent('draw:pen', [b]); @@ -182,10 +187,6 @@ define([ } ] }), true ); - button.menu.on('show:after', function(menu) { - button.toggle(true, true); - me.depressButtons(button); - }) button.currentColor = config.color; button.setColor(button.currentColor); var picker = new Common.UI.ThemeColorPalette({