From ecaaa8967ed6fb5d99d05315b1a7698709e4a2c8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 12 Sep 2023 18:24:44 +0300 Subject: [PATCH] [PDFE] Send pen index --- apps/common/main/lib/controller/Draw.js | 2 +- apps/common/main/lib/view/Draw.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/controller/Draw.js b/apps/common/main/lib/controller/Draw.js index f2f10635fd..6cbba352eb 100644 --- a/apps/common/main/lib/controller/Draw.js +++ b/apps/common/main/lib/controller/Draw.js @@ -143,7 +143,7 @@ define([ stroke.asc_putPrstDash(Asc.c_oDashType.solid); stroke.put_width(options.size.arr[options.size.idx]); stroke.put_transparent(options.opacity * 2.55); - this.api.asc_StartDrawInk(stroke); + this.api.asc_StartDrawInk(stroke, options.idx); } } }, diff --git a/apps/common/main/lib/view/Draw.js b/apps/common/main/lib/view/Draw.js index 7558e1c813..50b837be45 100644 --- a/apps/common/main/lib/view/Draw.js +++ b/apps/common/main/lib/view/Draw.js @@ -103,9 +103,9 @@ define([ var _set = Common.enumLock; var penOptions = [ - {hint: this.txtPen, color: '3D8A44', opacity: 100, size: {arr: [0.25, 0.5, 1, 2, 3.5], idx: 2}, iconCls: 'btn-pen-tool'}, - {hint: this.txtPen, color: 'D43230', opacity: 100, size: {arr: [0.25, 0.5, 1, 2, 3.5], idx: 2}, iconCls: 'btn-pen-tool'}, - {hint: this.txtHighlighter, color: 'FFFC54', opacity: 50, size: {arr: [2, 4, 6, 8, 10], idx: 2}, iconCls: 'btn-highlighter-tool', + {hint: this.txtPen, color: '3D8A44', opacity: 100, size: {arr: [0.25, 0.5, 1, 2, 3.5], idx: 2}, iconCls: 'btn-pen-tool', idx: 0}, + {hint: this.txtPen, color: 'D43230', opacity: 100, size: {arr: [0.25, 0.5, 1, 2, 3.5], idx: 2}, iconCls: 'btn-pen-tool', idx: 1}, + {hint: this.txtHighlighter, color: 'FFFC54', opacity: 50, size: {arr: [2, 4, 6, 8, 10], idx: 2}, iconCls: 'btn-highlighter-tool', idx: 2, colors: [ 'FFFC54', '72F54A', '74F9FD', 'EB51F7', 'A900F9', 'EF8B3A', '7272FF', 'FF63A4', '1DFF92', '03DA18', '249B01', 'C504D2', '0633D1', 'FFF7A0', 'FF0303', 'FFFFFF', 'D3D3D4', '969696', '606060', '000000'