Commit 82263385 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Выставила корректный цвет для Accent при отрисовке линий

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59698 954022d7-b5bf-4e40-9824-e11837661b57
parent d2878221
...@@ -30,12 +30,6 @@ CMathSize.prototype.SetZero = function() ...@@ -30,12 +30,6 @@ CMathSize.prototype.SetZero = function()
this.ascent = 0; this.ascent = 0;
} }
function CMathRecalcTextInfo()
{
this.StyleCode = null;
this.bAccentIJ = false;
}
function CMathText(bJDraw) function CMathText(bJDraw)
{ {
// для Para_Run // для Para_Run
...@@ -549,20 +543,8 @@ CMathText.prototype = ...@@ -549,20 +543,8 @@ CMathText.prototype =
height = g_oTextMeasurer.GetHeight(); height = g_oTextMeasurer.GetHeight();
*/ */
/*if(!this.bJDraw)
this.Parent = Parent;
else
this.Parent = null;*/
var letter = this.getCode(); var letter = this.getCode();
/*if(this.bJDraw)
letter = this.code;
else if(RPI.UpdateMathPr || Math_NeedResize == false || this.RecalcInfo.NewLetter == true)
letter = this.getCode();
else
letter = this.RecalcInfo.StyleCode;*/
var bAccentIJ = this.bJDraw ? false : this.Parent.IsAccent(); var bAccentIJ = this.bJDraw ? false : this.Parent.IsAccent();
bAccentIJ = bAccentIJ && (this.value == 0x69 || this.value == 0x6A); bAccentIJ = bAccentIJ && (this.value == 0x69 || this.value == 0x6A);
...@@ -601,7 +583,6 @@ CMathText.prototype = ...@@ -601,7 +583,6 @@ CMathText.prototype =
this.size.height = height; this.size.height = height;
this.size.ascent = ascent; this.size.ascent = ascent;
//this.RecalcInfo.NewLetter = false;
}, },
PreRecalc: function(Parent, ParaMath, ArgSize, RPI) PreRecalc: function(Parent, ParaMath, ArgSize, RPI)
{ {
......
...@@ -393,8 +393,10 @@ CGlyphOperator.prototype.draw = function(pGraphics, XX, YY, PDSE) ...@@ -393,8 +393,10 @@ CGlyphOperator.prototype.draw = function(pGraphics, XX, YY, PDSE)
pGraphics.df(); pGraphics.df();
pGraphics.SetIntegerGrid(intGrid); pGraphics.SetIntegerGrid(intGrid);
} }
CGlyphOperator.prototype.drawOnlyLines = function(x, y, pGraphics) CGlyphOperator.prototype.drawOnlyLines = function(x, y, pGraphics, PDSE)
{ {
this.Parent.Make_ShdColor(PDSE);
this.draw(x, y, pGraphics); this.draw(x, y, pGraphics);
} }
CGlyphOperator.prototype.getCtrPrp = function() CGlyphOperator.prototype.getCtrPrp = function()
...@@ -2939,6 +2941,8 @@ COperator.prototype.draw = function(x, y, pGraphics, PDSE) ...@@ -2939,6 +2941,8 @@ COperator.prototype.draw = function(x, y, pGraphics, PDSE)
// выставляем font, если нужно отрисовать текст // выставляем font, если нужно отрисовать текст
//pGraphics.b_color1(0,0,0,255); //pGraphics.b_color1(0,0,0,255);
this.Make_ShdColor(PDSE);
var ctrPrp = this.GetTPrpToControlLetter(); var ctrPrp = this.GetTPrpToControlLetter();
var Font = var Font =
......
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