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

[SSE] Enable text orientation button for shape without text, use asc_getAngle() for shapes.

Browse source 
Fix vertical align for shapes (deselect all buttons, when alignment=null)
This commit is contained in:
Julia Radzhabova 2020-05-13 20:47:56 +03:00
parent 7440ad31af
commit d497e4b761
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -2302,12 +2302,10 @@ define([
case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-valign-bottom'; break; case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-valign-bottom'; break;
} }
if (index > -1) {
toolbar.btnAlignTop.toggle(index===0, true); toolbar.btnAlignTop.toggle(index===0, true);
toolbar.btnAlignMiddle.toggle(index===1, true); toolbar.btnAlignMiddle.toggle(index===1, true);
toolbar.btnAlignBottom.toggle(index===2, true); toolbar.btnAlignBottom.toggle(index===2, true);
} }
}
need_disable = this._state.controlsdisabled.filters || formatTableInfo!==null || filterInfo && filterInfo.asc_getIsAutoFilter()===null; need_disable = this._state.controlsdisabled.filters || formatTableInfo!==null || filterInfo && filterInfo.asc_getIsAutoFilter()===null;
// (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable); // (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable);
@ -2386,23 +2384,15 @@ define([
} }
} }
if (selectionType == Asc.c_oAscSelectionType.RangeShapeText) {
var SelectedObjects = this.api.asc_getGraphicObjectProps();
for (var i=0; i<SelectedObjects.length; ++i)
{
if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image)
val = SelectedObjects[i].asc_getObjectValue().asc_getVert();
}
} else
val = info.asc_getAngle(); val = info.asc_getAngle();
if (this._state.angle !== val) { if (this._state.angle !== val) {
toolbar.btnTextOrient.menu.clearAll(); toolbar.btnTextOrient.menu.clearAll();
switch(val) { switch(val) {
case 45: toolbar.btnTextOrient.menu.items[1].setChecked(true, true); break; case 45: toolbar.btnTextOrient.menu.items[1].setChecked(true, true); break;
case -45: toolbar.btnTextOrient.menu.items[2].setChecked(true, true); break; case -45: toolbar.btnTextOrient.menu.items[2].setChecked(true, true); break;
case 90: case Asc.c_oAscVertDrawingText.vert270: toolbar.btnTextOrient.menu.items[3].setChecked(true, true); break; case 90: toolbar.btnTextOrient.menu.items[3].setChecked(true, true); break;
case -90: case Asc.c_oAscVertDrawingText.vert: toolbar.btnTextOrient.menu.items[4].setChecked(true, true); break; case -90: toolbar.btnTextOrient.menu.items[4].setChecked(true, true); break;
default: toolbar.btnTextOrient.menu.items[0].setChecked(true, true); break; case 0: toolbar.btnTextOrient.menu.items[0].setChecked(true, true); break;
} }
this._state.angle = val; this._state.angle = val;
} }

2
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -603,7 +603,7 @@ define([
id : 'id-toolbar-rtn-textorient', id : 'id-toolbar-rtn-textorient',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon text-orient-ccw', iconCls : 'toolbar__icon text-orient-ccw',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ {