pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix Bug 76178' (#661) from fix/bugfix into release/v9.1.0

Browse Source
This commit is contained in:
Julia Radzhabova
2025-09-01 18:32:35 +00:00
parent 288b04fb8b c0fbc0e6c8
commit 8d03f97940
3 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/presentationeditor/main/app/view/SlideSettings.js
View File

@ -123,8 +123,7 @@ define([
{displayValue: this.textColor, value: Asc.c_oAscFill.FILL_TYPE_SOLID},
{displayValue: this.textGradientFill, value: Asc.c_oAscFill.FILL_TYPE_GRAD},
{displayValue: this.textImageTexture, value: Asc.c_oAscFill.FILL_TYPE_BLIP},
{displayValue: this.textPatternFill, value: Asc.c_oAscFill.FILL_TYPE_PATT},
{displayValue: this.textNoFill, value: Asc.c_oAscFill.FILL_TYPE_NOFILL}
{displayValue: this.textPatternFill, value: Asc.c_oAscFill.FILL_TYPE_PATT}
];
this.cmbFillSrc = new Common.UI.ComboBox({
@ -146,7 +145,7 @@ define([
this.btnBackColor = new Common.UI.ColorButton({
parentEl: $('#slide-back-color-btn'),
disabled: true,
transparent: true,
transparent: false,
menu: true,
color: 'ffffff',
eyeDropper: true,
@ -356,17 +355,6 @@ define([
this.api.SetSlideProps(props);
}
break;
case Asc.c_oAscFill.FILL_TYPE_NOFILL:
this._state.FillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
if (!this._noApply) {
var props = new Asc.CAscSlideProps();
var fill = new Asc.asc_CShapeFill();
fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
fill.put_fill(null);
props.put_background(fill);
this.api.SetSlideProps(props);
}
break;
}
this.fireEvent('editcomplete', this);
},
@ -377,16 +365,9 @@ define([
if (this.api && !this._noApply) {
var props = new Asc.CAscSlideProps();
var fill = new Asc.asc_CShapeFill();
if (this.SlideColor.Color=='transparent') {
fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
fill.put_fill(null);
} else {
fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
fill.put_fill( new Asc.asc_CFillSolid());
fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(this.SlideColor.Color));
}
fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
fill.put_fill( new Asc.asc_CFillSolid());
fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(this.SlideColor.Color));
props.put_background(fill);
this.api.SetSlideProps(props);
}
@ -1252,7 +1233,7 @@ define([
}
if (fill===null || fill_type===null || fill_type==Asc.c_oAscFill.FILL_TYPE_NOFILL) { // заливки нет или не совпадает у неск. фигур
this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL;
this.OriginalFillType = null;
} else if (fill_type==Asc.c_oAscFill.FILL_TYPE_SOLID) {
fill = fill.get_fill();
color = fill.get_color();

13
apps/presentationeditor/mobile/src/controller/edit/EditSlide.jsx
View File

@ -105,16 +105,9 @@ class EditSlideController extends Component {
let props = new Asc.CAscSlideProps(),
fill = new Asc.asc_CShapeFill();
if (color == 'transparent') {
fill.put_type(Asc.c_oAscFill.FILL_TYPE_NOFILL);
fill.put_fill(null);
} else {
fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
fill.put_fill(new Asc.asc_CFillSolid());
fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(color));
}
fill.put_type(Asc.c_oAscFill.FILL_TYPE_SOLID);
fill.put_fill(new Asc.asc_CFillSolid());
fill.get_fill().put_color(Common.Utils.ThemeColor.getRgbColor(color));
props.put_background(fill);
api.SetSlideProps(props);

2
apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx
View File

@ -449,7 +449,7 @@ const PageFillColor = props => {
</NavRight>
}
</Navbar>
<ThemeColorPalette changeColor={changeColor} curColor={fillColor} customColors={customColors} transparent={true} />
<ThemeColorPalette changeColor={changeColor} curColor={fillColor} customColors={customColors} transparent={false} />
<List>
<ListItem title={_t.textAddCustomColor} link={'/edit-custom-color/'} routeProps={{
onFillColor: props.onFillColor