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

Поправила баг с расчетом Gap объектов

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62229 954022d7-b5bf-4e40-9824-e11837661b57
parent 6e08b966
...@@ -458,7 +458,7 @@ CMathGapsInfo.prototype = ...@@ -458,7 +458,7 @@ CMathGapsInfo.prototype =
getGapsMComp: function(MComp, direct) getGapsMComp: function(MComp, direct)
{ {
var kind = MComp.kind; var kind = MComp.kind;
var checkGap = this.checkGapKind(kind); var checkGap = this.checkGapKind(MComp);
var bNeedGap = !checkGap.bEmptyGaps && !checkGap.bChildGaps; var bNeedGap = !checkGap.bEmptyGaps && !checkGap.bChildGaps;
...@@ -839,7 +839,7 @@ CMathContent.prototype.getGapsInside = function(GapsInfo) // учитываем ...@@ -839,7 +839,7 @@ CMathContent.prototype.getGapsInside = function(GapsInfo) // учитываем
if(bFirstComp) if(bFirstComp)
{ {
checkGap = GapsInfo.checkGapKind(this.Content[1].kind); checkGap = GapsInfo.checkGapKind(this.Content[1]);
if(!checkGap.bChildGaps) if(!checkGap.bChildGaps)
{ {
...@@ -850,11 +850,11 @@ CMathContent.prototype.getGapsInside = function(GapsInfo) // учитываем ...@@ -850,11 +850,11 @@ CMathContent.prototype.getGapsInside = function(GapsInfo) // учитываем
if(bLastComp) if(bLastComp)
{ {
checkGap = GapsInfo.checkGapKind(this.Content[len - 1].kind); checkGap = GapsInfo.checkGapKind(this.Content[len - 1]);
if(!checkGap.bChildGaps) if(!checkGap.bChildGaps)
{ {
gaps.right = GapsInfo.getGapsMComp(this.Content[len - 1], 1); gaps.right = GapsInfo.getGapsMComp(this.Content[len - 2], 1);
//gaps.right = gapsMComp.right; //gaps.right = gapsMComp.right;
} }
} }
......
...@@ -3500,7 +3500,7 @@ CDelimiter.prototype.Recalculate_Range = function(PRS, ParaPr, Depth) ...@@ -3500,7 +3500,7 @@ CDelimiter.prototype.Recalculate_Range = function(PRS, ParaPr, Depth)
CDelimiter.prototype.Is_EmptyGaps = function() CDelimiter.prototype.Is_EmptyGaps = function()
{ {
var Height = g_oTextMeasurer.GetHeight(); var Height = g_oTextMeasurer.GetHeight();
var result = this.GeneralMetrics.size.height < Height; var result = this.GeneralMetrics.height < Height;
return result; return result;
}; };
......
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