pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 19:44:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SSE DE PE] Fix bug in shape shape menu

Browse Source
This commit is contained in:
Alexei Koshelev
2023-12-23 19:59:48 +03:00
parent c81c34cf4a
commit 1ea7e95bee
6 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/documenteditor/main/app/view/ShapeSettings.js
View File

@ -96,6 +96,7 @@ define([
BGColor: 'ffffff',
GradColor: '000000',
ShadowColor: 'transparent',
ShadowPreset: null,
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
WrappingStyle: Asc.c_oAscWrapStyle2.Inline,
CanBeFlow: true,
@ -1328,8 +1329,10 @@ define([
}
if(shadowPresetRecord) {
this._state.ShadowPreset = shadowPresetRecord;
this.viewShadowShapePresets.selectRecord(shadowPresetRecord);
} else {
this._state.ShadowPreset = null;
this.viewShadowShapePresets.deselectAll();
}
@ -1921,6 +1924,18 @@ define([
);
this.btnShadowShape.menu.on('item:click', _.bind(this.onSelectShadowMenu, this));
this.mnuShadowShapeColor.menu.on('item:click', _.bind(this.onSelectShadowColorMenu, this));
this.btnShadowShape.menu.on('show:before', () => {
if(this._state.ShadowPreset) {
this.viewShadowShapePresets.selectRecord(this._state.ShadowPreset);
} else {
this.viewShadowShapePresets.deselectAll();
}
});
this.mnuShadowShapeColor.menu.on('show:before', () => {
if(this._state.ShadowColor) {
this.mnuShadowShapeColorPicker.select(this._state.ShadowColor,true);
}
});
this.viewShadowShapePresets = new Common.UI.DataView({
el: $('#shape-button-shadow-shape-menu'),
@ -1943,7 +1958,7 @@ define([
]),
itemTemplate: _.template(
'<div class="item-shadow">' +
'<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px rgba(0, 0, 0, 0.40);"></div>' +
'<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px var(--text-tertiary);"></div>' +
'</div>')
});
this.viewShadowShapePresets.on('item:click', _.bind(this.onSelectShadowPreset, this));

2
apps/documenteditor/main/resources/less/rightmenu.less
View File

@ -271,7 +271,7 @@
height: 32px;
background: white;
border-radius: 1px;
border: 1px rgba(0, 0, 0, 0.80) solid;
border: 1px var(--icon-normal) solid;
}
}

17
apps/presentationeditor/main/app/view/ShapeSettings.js
View File

@ -93,6 +93,7 @@ define([
BGColor: 'ffffff',
GradColor: '000000',
ShadowColor: 'transparent',
ShadowPreset: null,
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
DisabledFillPanels: false,
DisabledControls: false,
@ -1256,8 +1257,10 @@ define([
}
if(shadowPresetRecord) {
this._state.ShadowPreset = shadowPresetRecord;
this.viewShadowShapePresets.selectRecord(shadowPresetRecord);
} else {
this._state.ShadowPreset = null;
this.viewShadowShapePresets.deselectAll();
}
@ -1784,6 +1787,18 @@ define([
);
this.btnShadowShape.menu.on('item:click', _.bind(this.onSelectShadowMenu, this));
this.mnuShadowShapeColor.menu.on('item:click', _.bind(this.onSelectShadowColorMenu, this));
this.btnShadowShape.menu.on('show:before', () => {
if(this._state.ShadowPreset) {
this.viewShadowShapePresets.selectRecord(this._state.ShadowPreset);
} else {
this.viewShadowShapePresets.deselectAll();
}
});
this.mnuShadowShapeColor.menu.on('show:before', () => {
if(this._state.ShadowColor) {
this.mnuShadowShapeColorPicker.select(this._state.ShadowColor,true);
}
});
this.viewShadowShapePresets = new Common.UI.DataView({
el: $('#shape-button-shadow-shape-menu'),
@ -1806,7 +1821,7 @@ define([
]),
itemTemplate: _.template(
'<div class="item-shadow">' +
'<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px rgba(0, 0, 0, 0.40);"></div>' +
'<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px var(--text-tertiary);"></div>' +
'</div>')
});
this.viewShadowShapePresets.on('item:click', _.bind(this.onSelectShadowPreset, this));

2
apps/presentationeditor/main/resources/less/rightmenu.less
View File

@ -186,7 +186,7 @@
height: 32px;
background: white;
border-radius: 1px;
border: 1px rgba(0, 0, 0, 0.80) solid;
border: 1px var(--icon-normal) solid;
}
}

17
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View File

@ -94,6 +94,7 @@ define([
BGColor: 'ffffff',
GradColor: '000000',
ShadowColor: 'transparent',
ShadowPreset: null,
GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR,
DisabledFillPanels: false,
DisabledControls: false,
@ -1251,8 +1252,10 @@ define([
}
if(shadowPresetRecord) {
this._state.ShadowPreset = shadowPresetRecord;
this.viewShadowShapePresets.selectRecord(shadowPresetRecord);
} else {
this._state.ShadowPreset = null;
this.viewShadowShapePresets.deselectAll();
}
@ -1799,6 +1802,18 @@ define([
);
this.btnShadowShape.menu.on('item:click', _.bind(this.onSelectShadowMenu, this));
this.mnuShadowShapeColor.menu.on('item:click', _.bind(this.onSelectShadowColorMenu, this));
this.btnShadowShape.menu.on('show:before', () => {
if(this._state.ShadowPreset) {
this.viewShadowShapePresets.selectRecord(this._state.ShadowPreset);
} else {
this.viewShadowShapePresets.deselectAll();
}
});
this.mnuShadowShapeColor.menu.on('show:before', () => {
if(this._state.ShadowColor) {
this.mnuShadowShapeColorPicker.select(this._state.ShadowColor,true);
}
});
this.viewShadowShapePresets = new Common.UI.DataView({
el: $('#shape-button-shadow-shape-menu'),
@ -1821,7 +1836,7 @@ define([
]),
itemTemplate: _.template(
'<div class="item-shadow">' +
'<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px rgba(0, 0, 0, 0.40);"></div>' +
'<div style="margin-bottom:<%= offsetY %>px; margin-right:<%= offsetX %>px; box-shadow: <%= offsetX %>px <%= offsetY %>px 0px <%= spread %>px var(--text-tertiary);"></div>' +
'</div>')
});
this.viewShadowShapePresets.on('item:click', _.bind(this.onSelectShadowPreset, this));

2
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View File

@ -184,7 +184,7 @@
height: 32px;
background: white;
border-radius: 1px;
border: 1px rgba(0, 0, 0, 0.80) solid;
border: 1px var(--icon-normal) solid;
}
}