[PDF] Change annotation opacity from the quick-access toolbar

ONLYOFFICE · Dec 20, 2024 · f4a59df · f4a59df
1 parent d073555
commit f4a59df
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 3 deletions.
diff --git a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js
@@ -869,6 +869,8 @@ define([], function () {
                 documentHolder.btnAddAnnotComment.on('click',          _.bind(this.addComment, this, {isFromSelBar: true}));
                 documentHolder.mnuStrokeHighlightColorPicker.on('select', _.bind(this.onSelectStrokeColor, this, documentHolder.btnStrokeHighlightColor));
                 documentHolder.mnuStrokeColorPicker.on('select',          _.bind(this.onSelectStrokeColor, this, documentHolder.btnStrokeColor));
+                documentHolder.btnStrokeColor.menu.on('show:after',          _.bind(this.onStrokeShowAfter, this));
+                documentHolder.btnStrokeHighlightColor.menu.on('show:after', _.bind(this.onStrokeShowAfter, this));
                 this.api.UpdateInterfaceState();
             }
 
@@ -2492,6 +2494,39 @@ define([], function () {
             this.api.asc_SetStrokeColor(parseInt(r, 16), parseInt(g, 16), parseInt(b, 16));
         };
 
+        dh.onSetStrokeOpacity = function(sizePicker, direction) {
+            var val = this.api.asc_GetOpacity();
+            if (direction === 'up') {
+                if (val % 10 > 0.1) {
+                    val = Math.ceil(val / 10) * 10;
+                } else {
+                    val += 10;
+                }
+                val = Math.min(100, val);
+            } else {
+                if (val % 10 > 0.1) {
+                    val = Math.floor(val / 10) * 10;
+                } else {
+                    val -= 10
+                }
+                val = Math.max(0, val);
+            }
+            sizePicker.setValue(val + '%');
+            this.api.asc_SetOpacity(val);
+        };
+
+        dh.onStrokeShowAfter = function(menu) {
+            if (!menu.sizePicker) {
+                menu.sizePicker = new Common.UI.UpDownPicker({
+                    el: menu.cmpEl.find('.custom-scale'),
+                    caption: this.documentHolder.txtOpacity,
+                    minWidth: 40
+                });
+                menu.sizePicker.on('click', _.bind(this.onSetStrokeOpacity, this, menu.sizePicker));
+            }
+            menu.sizePicker.setValue(this.api.asc_GetOpacity() + '%');
+        };
+
         dh.applySettings = function() {
             !Common.Utils.InternalSettings.get('pdfe-settings-annot-bar') && this.onHideAnnotBar();
         };

diff --git a/apps/pdfeditor/main/app/view/DocumentHolderExt.js b/apps/pdfeditor/main/app/view/DocumentHolderExt.js
@@ -1621,6 +1621,12 @@ define([], function () {
                     '249B01', 'C504D2', '0633D1', 'FFF7A0', 'FF0303', 'FFFFFF', 'D3D3D4', '969696', '606060', '000000'
                 ],
                 color: 'FFFC54',
+                additionalItemsAfter: [
+                    new Common.UI.MenuItem({
+                        template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
+                        stopPropagation: true
+                    })
+                ],
                 dynamiccolors: config.dynamiccolors,
                 themecolors: config.themecolors,
                 effects: config.effects,
@@ -1643,6 +1649,12 @@ define([], function () {
                 colorLine: 'box',
                 colors: config.colors,
                 color: '3D8A44',
+                additionalItemsAfter: [
+                    new Common.UI.MenuItem({
+                        template: _.template('<div class="custom-scale" data-stopPropagation="true"></div>'),
+                        stopPropagation: true
+                    })
+                ],
                 dynamiccolors: config.dynamiccolors,
                 themecolors: config.themecolors,
                 effects: config.effects,

diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -1439,10 +1439,10 @@ define([
                 button.currentColor = button.color;
                 if (opacity) {
                     var onShowAfter = function(menu) {
-                        if (button.sizePicker) {
-                            button.sizePicker.setValue(Common.Utils.InternalSettings.get("pdfe-annot-opacity-" + id) + '%');
+                        if (menu.sizePicker) {
+                            menu.sizePicker.setValue(Common.Utils.InternalSettings.get("pdfe-annot-opacity-" + id) + '%');
                         } else {
-                            button.sizePicker = me.createOpacityPicker(id, menu.cmpEl.find('.custom-scale'));
+                            menu.sizePicker = me.createOpacityPicker(id, menu.cmpEl.find('.custom-scale'));
                         }
                     };
                     button.menu.on('show:after', onShowAfter);

diff --git a/apps/pdfeditor/main/locale/en.json b/apps/pdfeditor/main/locale/en.json
@@ -1242,6 +1242,7 @@
   "PDFE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.<br>Are you sure you want to continue?",
   "PDFE.Views.DocumentHolder.unicodeText": "Unicode",
   "PDFE.Views.DocumentHolder.vertAlignText": "Vertical alignment",
+  "PDFE.Views.DocumentHolder.txtOpacity": "Opacity",
   "PDFE.Views.FileMenu.ariaFileMenu": "File menu",
   "PDFE.Views.FileMenu.btnBackCaption": "Open File Location",
   "PDFE.Views.FileMenu.btnCloseEditor": "Close File",