From 49000398bd507c9147a0ddb01a1606ac00938be8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 16:31:23 +0300 Subject: [PATCH 1/2] [DE] Change preview size for list levels --- apps/documenteditor/main/app/view/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index b73c4c089..176df8653 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1695,7 +1695,7 @@ define([ // set menus var me = this; - var levelTemplate = _.template(''); + var levelTemplate = _.template(''); var items = [], ids = []; for (var i=0; i<9; i++) { ids.push('id-toolbar-menu-markers-level-' + i); From 28447731e62dab95f874611dbaf4ea73592ccd18 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 16:38:58 +0300 Subject: [PATCH 2/2] Fix Bug 49733 --- .../main/app/view/TextArtSettings.js | 37 +++++++++++-------- .../main/app/view/TextArtSettings.js | 36 ++++++++++-------- .../main/app/view/TextArtSettings.js | 36 ++++++++++-------- 3 files changed, 61 insertions(+), 48 deletions(-) diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 868ebc5a9..58beba4ab 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -89,7 +89,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -121,6 +122,8 @@ define([ this.FillColorContainer = $('#textart-panel-color-fill'); this.FillGradientContainer = $('#textart-panel-gradient-fill'); this.TransparencyContainer = $('#textart-panel-transparent-fill'); + + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -1126,22 +1129,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1294,6 +1292,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index cc71d911c..5abd60a1a 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -93,7 +93,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -134,6 +135,7 @@ define([ el.html(this.template({ scope: this })); + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -1538,22 +1540,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1727,6 +1724,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index b0b4b315c..31d6dd13b 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -94,7 +94,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -135,6 +136,7 @@ define([ el.html(this.template({ scope: this })); + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -1543,22 +1545,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1730,6 +1727,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color',