Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] [PE] Gradient Slider: add new thumb, remove thumb

Browse source
This commit is contained in:
Julia Svinareva 2019-11-14 09:43:04 +03:00
parent 87270ee486
commit 7d7149a9e5
2 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -550,17 +550,16 @@ define([
}); });
fill.get_fill().put_positions(arr); fill.get_fill().put_positions(arr);
if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true);
fill.get_fill().put_linear_scale(true);
}
arr = [];
this.GradColor.colors.forEach(function(item){
arr.push(Common.Utils.ThemeColor.getRgbColor(item));
});
fill.get_fill().put_colors(arr);
} }
arr = [];
this.GradColor.colors.forEach(function(item){
arr.push(Common.Utils.ThemeColor.getRgbColor(item));
});
fill.get_fill().put_colors(arr);
props.put_fill(fill); props.put_fill(fill);
this.imgprops.put_ShapeProperties(props); this.imgprops.put_ShapeProperties(props);
this.api.ImgApply(this.imgprops); this.api.ImgApply(this.imgprops);
@ -1357,6 +1356,16 @@ define([
me.GradColor.colors = colors; me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx; me.GradColor.currentIdx = currentIdx;
}); });
this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
me.sldrGradient.addNewThumb(index, color);
});
this.sldrGradient.on('removethumb', function(cmp, index){
me.GradColor.colors.splice(index, 1);
me.GradColor.values.splice(index, 1);
me.sldrGradient.removeThumb(index);
me.sldrGradient.changeGradientStyle();
});
this.fillControls.push(this.sldrGradient); this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

29
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -531,17 +531,16 @@ define([
}); });
fill.get_fill().put_positions(arr); fill.get_fill().put_positions(arr);
if (this.OriginalFillType !== Asc.c_oAscFill.FILL_TYPE_GRAD) { if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000);
fill.get_fill().put_linear_angle(this.GradLinearDirectionType * 60000); fill.get_fill().put_linear_scale(true);
fill.get_fill().put_linear_scale(true);
}
arr = [];
this.GradColor.colors.forEach(function(item){
arr.push(Common.Utils.ThemeColor.getRgbColor(item));
});
fill.get_fill().put_colors(arr);
} }
arr = [];
this.GradColor.colors.forEach(function(item){
arr.push(Common.Utils.ThemeColor.getRgbColor(item));
});
fill.get_fill().put_colors(arr);
props.put_fill(fill); props.put_fill(fill);
this.api.ShapeApply(props); this.api.ShapeApply(props);
this._sliderChanged = false; this._sliderChanged = false;
@ -1269,6 +1268,16 @@ define([
me.GradColor.colors = colors; me.GradColor.colors = colors;
me.GradColor.currentIdx = currentIdx; me.GradColor.currentIdx = currentIdx;
}); });
this.sldrGradient.on('addthumb', function(cmp, index, nearIndex, color){
me.GradColor.colors[index] = me.GradColor.colors[nearIndex];
me.sldrGradient.addNewThumb(index, color);
});
this.sldrGradient.on('removethumb', function(cmp, index){
me.GradColor.colors.splice(index, 1);
me.GradColor.values.splice(index, 1);
me.sldrGradient.removeThumb(index);
me.sldrGradient.changeGradientStyle();
});
this.fillControls.push(this.sldrGradient); this.fillControls.push(this.sldrGradient);
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({