Skip to content

S
sdkjs
Commit 9de2e674 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov
Browse files
Options

Ускорение отрисовки параграфа. 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48942 954022d7-b5bf-4e40-9824-e11837661b57
parent c0148d33
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 182 deletions
Word/Editor/Paragraph.js
View file @ 9de2e674
This diff is collapsed.
Word/Editor/ParagraphContent.js
View file @ 9de2e674
...@@ -97,70 +97,55 @@ function ParaText(value) ...@@ -97,70 +97,55 @@ function ParaText(value)
this.Width = 0; this.Width = 0;
this.Height = 0; this.Height = 0;
this.WidthVisible = 0; this.WidthVisible = 0;
this.IsNBSP = (this.Value === nbsp_string ? true : false);
} }
ParaText.prototype = ParaText.prototype =
{ {
Draw : function(X,Y,Context) Draw : function(X,Y,Context)
{ {
try Context.SetFontSlot( this.FontSlot, this.FontKoef );
{
Context.SetFontSlot( this.FontSlot, this.FontKoef );
if ( true === this.Is_NBSP() && editor.ShowParaMarks )
Context.FillText( X, Y, String.fromCharCode( 0x00B0 ) );
else
Context.FillText( X, Y, this.CalcValue );
}
catch(e)
{
} if ( true === this.IsNBSP && editor.ShowParaMarks )
Context.FillText( X, Y, String.fromCharCode( 0x00B0 ) );
else
Context.FillText( X, Y, this.CalcValue );
}, },
Measure : function(Context, TextPr) Measure : function(Context, TextPr)
{ {
try this.FontKoef = TextPr.Get_FontKoef();
{
this.FontKoef = TextPr.Get_FontKoef();
var bCapitals = false; var bCapitals = false;
if ( true === TextPr.Caps || true === TextPr.SmallCaps ) if ( true === TextPr.Caps || true === TextPr.SmallCaps )
{ {
this.CalcValue = this.Value.toUpperCase(); this.CalcValue = this.Value.toUpperCase();
bCapitals = ( this.CalcValue === this.Value ? true : false ); bCapitals = ( this.CalcValue === this.Value ? true : false );
} }
else else
{ {
this.CalcValue = this.Value; this.CalcValue = this.Value;
bCapitals = false; bCapitals = false;
} }
if ( true != TextPr.Caps && true === TextPr.SmallCaps && false === bCapitals ) if ( true != TextPr.Caps && true === TextPr.SmallCaps && false === bCapitals )
this.FontKoef *= smallcaps_Koef; this.FontKoef *= smallcaps_Koef;
var Hint = TextPr.RFonts.Hint; var Hint = TextPr.RFonts.Hint;
var bCS = TextPr.CS; var bCS = TextPr.CS;
var bRTL = TextPr.RTL; var bRTL = TextPr.RTL;
var lcid = TextPr.Lang.EastAsia; var lcid = TextPr.Lang.EastAsia;
this.FontSlot = g_font_detector.Get_FontClass( this.CalcValue.charCodeAt(0), Hint, lcid, bCS, bRTL ); this.FontSlot = g_font_detector.Get_FontClass( this.CalcValue.charCodeAt(0), Hint, lcid, bCS, bRTL );
Context.SetFontSlot( this.FontSlot, this.FontKoef ); Context.SetFontSlot( this.FontSlot, this.FontKoef );
var Temp = Context.Measure( this.CalcValue ); var Temp = Context.Measure( this.CalcValue );
Temp.Width = Math.max( Temp.Width + TextPr.Spacing, 0 ); Temp.Width = Math.max( Temp.Width + TextPr.Spacing, 0 );
this.Width = Temp.Width; this.Width = Temp.Width;
this.Height = Temp.Height; this.Height = Temp.Height;
this.WidthVisible = Temp.Width; this.WidthVisible = Temp.Width;
}
catch(e)
{
this.CalcValue = this.Value;
this.Width = 0;
this.Height = 0;
this.WidthVisible = 0;
}
}, },
Is_RealContent : function() Is_RealContent : function()
...@@ -255,40 +240,10 @@ ParaSpace.prototype = ...@@ -255,40 +240,10 @@ ParaSpace.prototype =
} }
} }
try Context.SetFontSlot( fontslot_ASCII, this.FontKoef );
{
Context.SetFontSlot( fontslot_ASCII, this.FontKoef );
/*var OldFont;
if ( true === this.SmallCaps )
{
OldFont = Context.GetFont();
var TempFont =
{
FontFamily :
{
Index : OldFont.FontFamily.Index,
Name : OldFont.FontFamily.Name
},
FontSize : OldFont.FontSize * smallcaps_Koef,
Bold : OldFont.Bold,
Italic : OldFont.Italic
};
Context.SetFont( TempFont );
}*/
if ( editor.ShowParaMarks )
Context.FillText( X, Y, sString );
//if ( true === this.SmallCaps )
// Context.SetFont(OldFont);
}
catch(e)
{
} if ( editor.ShowParaMarks )
Context.FillText( X, Y, sString );
}, },
Measure : function(Context, TextPr) Measure : function(Context, TextPr)
...@@ -304,31 +259,20 @@ ParaSpace.prototype = ...@@ -304,31 +259,20 @@ ParaSpace.prototype =
} }
} }
try this.FontKoef = TextPr.Get_FontKoef();
{
this.FontKoef = TextPr.Get_FontKoef();
if ( true != TextPr.Caps && true === TextPr.SmallCaps ) if ( true != TextPr.Caps && true === TextPr.SmallCaps )
this.FontKoef *= smallcaps_Koef; this.FontKoef *= smallcaps_Koef;
Context.SetFontSlot( fontslot_ASCII, this.FontKoef ); Context.SetFontSlot( fontslot_ASCII, this.FontKoef );
var Temp = Context.Measure( sString ); var Temp = Context.Measure( sString );
Temp.Width = Math.max( Temp.Width + TextPr.Spacing, 0 ); Temp.Width = Math.max( Temp.Width + TextPr.Spacing, 0 );
this.Width = Temp.Width; this.Width = Temp.Width;
this.Height = Temp.Height; this.Height = Temp.Height;
this.WidthVisible = Temp.Width; this.WidthVisible = Temp.Width;
}
catch(e)
{
this.Width = 0;
this.Height = 0;
this.WidthVisible = 0;
}
//return { Width : this.Width, Height : this.Height, WidthVisible : this.WidthVisible };
}, },
Is_RealContent : function() Is_RealContent : function()
...@@ -369,6 +313,7 @@ function ParaTextPr(Props) ...@@ -369,6 +313,7 @@ function ParaTextPr(Props)
this.Type = para_TextPr; this.Type = para_TextPr;
this.Value = new CTextPr(); this.Value = new CTextPr();
this.Parent = null; this.Parent = null;
this.CalcValue = this.Value;
this.Width = 0; this.Width = 0;
this.Height = 0; this.Height = 0;
...@@ -2117,6 +2062,8 @@ ParaTextPr.prototype = ...@@ -2117,6 +2062,8 @@ ParaTextPr.prototype =
function ParaEnd() function ParaEnd()
{ {
this.Type = para_End; this.Type = para_End;
this.TextPr = null; // Рассчитанные настройки текста для символа конца параграфа
} }
ParaEnd.prototype = ParaEnd.prototype =
......
Word/Editor/Spelling.js
View file @ 9de2e674
...@@ -213,6 +213,25 @@ CParaSpellChecker.prototype = ...@@ -213,6 +213,25 @@ CParaSpellChecker.prototype =
return true; return true;
}, },
Get_DrawingInfo : function()
{
var DrawingObject = new Object();
var Count = this.Elements.length;
for ( var Index = 0; Index < Count; Index++ )
{
var Element = this.Elements[Index];
if ( false === Element.Checked )
{
for ( var Pos = Element.StartPos; Pos <= Element.EndPos; Pos++ )
DrawingObject[Pos] = true;
}
}
return DrawingObject;
},
Document_UpdateInterfaceState : function(StartPos, EndPos) Document_UpdateInterfaceState : function(StartPos, EndPos)
{ {
// Надо определить, попадает ли какое-либо неверно набранное слово в заданный промежуток, и одно ли оно // Надо определить, попадает ли какое-либо неверно набранное слово в заданный промежуток, и одно ли оно
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7