Commit aece5789 authored by Alexander.Trofimov's avatar Alexander.Trofimov

delete default state color

parent 35666e48
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
}; };
this.cells = { this.cells = {
defaultState: { defaultState: {
background: new CColor(255, 255, 255), border: new CColor(212, 212, 212), color: new CColor(0, 0, 0) background: new CColor(255, 255, 255), border: new CColor(212, 212, 212)
}, padding: -1, /*px horizontal padding*/ }, padding: -1, /*px horizontal padding*/
paddingPlusBorder: -1 paddingPlusBorder: -1
}; };
......
...@@ -4598,7 +4598,6 @@ ...@@ -4598,7 +4598,6 @@
this._fetchCellCache(col, row).text = { this._fetchCellCache(col, row).text = {
state: this.stringRender.getInternalState(), state: this.stringRender.getInternalState(),
flags: fl, flags: fl,
color: (c.getFont().getColor() || this.settings.cells.defaultState.color),
metrics: tm, metrics: tm,
cellW: cto.maxWidth, cellW: cto.maxWidth,
cellHA: ha, cellHA: ha,
...@@ -6936,7 +6935,6 @@ ...@@ -6936,7 +6935,6 @@
var c = this._getVisibleCell(c1, r1); var c = this._getVisibleCell(c1, r1);
var font = c.getFont(); var font = c.getFont();
var fa = font.getVerticalAlign(); var fa = font.getVerticalAlign();
var fc = font.getColor();
var bg = c.getFill(); var bg = c.getFill();
var cellType = c.getType(); var cellType = c.getType();
var isNumberFormat = (!cellType || CellValueType.Number === cellType); var isNumberFormat = (!cellType || CellValueType.Number === cellType);
...@@ -7012,7 +7010,7 @@ ...@@ -7012,7 +7010,7 @@
cell_info.font.strikeout = font.getStrikeout(); cell_info.font.strikeout = font.getStrikeout();
cell_info.font.subscript = fa === AscCommon.vertalign_SubScript; cell_info.font.subscript = fa === AscCommon.vertalign_SubScript;
cell_info.font.superscript = fa === AscCommon.vertalign_SuperScript; cell_info.font.superscript = fa === AscCommon.vertalign_SuperScript;
cell_info.font.color = (fc ? asc_obj2Color(fc) : new Asc.asc_CColor(c_opt.defaultState.color)); cell_info.font.color = asc_obj2Color(font.getColor());
cell_info.fill = new asc_CFill((null != bg) ? asc_obj2Color(bg) : bg); cell_info.fill = new asc_CFill((null != bg) ? asc_obj2Color(bg) : bg);
...@@ -11515,7 +11513,7 @@ ...@@ -11515,7 +11513,7 @@
flags: fl, flags: fl,
font: new asc.FontProperties(font.getName(), font.getSize()), font: new asc.FontProperties(font.getName(), font.getSize()),
background: bg || this.settings.cells.defaultState.background, background: bg || this.settings.cells.defaultState.background,
textColor: font.getColor() || this.settings.cells.defaultState.color, textColor: font.getColor(),
cursorPos: cursorPos, cursorPos: cursorPos,
zoom: this.getZoom(), zoom: this.getZoom(),
focus: isFocus, focus: isFocus,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment