Commit cb9dbe6a authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

ASCWngds3

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56523 954022d7-b5bf-4e40-9824-e11837661b57
parent f3511c98
This diff is collapsed.
......@@ -277,7 +277,7 @@
this.AddLoadFonts(this.fontInfos[this.map_font_index["Arial"]], 0x0F);
this.AddLoadFonts(this.fontInfos[this.map_font_index["Symbol"]], 0x0F);
this.AddLoadFonts(this.fontInfos[this.map_font_index["Wingdings"]], 0x0F);
this.AddLoadFonts(this.fontInfos[this.map_font_index["Wingdings 3"]], 0x0F);
//this.AddLoadFonts(this.fontInfos[this.map_font_index["Wingdings 3"]], 0x0F);
this.AddLoadFonts(this.fontInfos[this.map_font_index["Courier New"]], 0x0F);
//if (is_default === true)
{
......
......@@ -6401,7 +6401,7 @@ Paragraph.prototype =
var X0 = TempWidth / 2 - TempRealWidth / 2;
pGraphics.SetFont( {FontFamily: { Name : "Wingdings 3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
pGraphics.SetFont( {FontFamily: { Name : "ASCWngds3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
if ( X0 > 0 )
pGraphics.FillText2( X1 + X0, Y, String.fromCharCode( tab_Symbol ), 0, TempWidth );
......
......@@ -2544,7 +2544,7 @@ ParaNewLine.prototype =
{
case break_Line:
{
Context.SetFont( {FontFamily: { Name : "Wingdings 3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
Context.SetFont( {FontFamily: { Name : "ASCWngds3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
Context.FillText( X, Y, String.fromCharCode( 0x0038/*0x21B5*/ ) );
break;
}
......@@ -2591,7 +2591,7 @@ ParaNewLine.prototype =
this.Width = 0;
this.Height = 0;
Context.SetFont( {FontFamily: { Name : "Wingdings 3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
Context.SetFont( {FontFamily: { Name : "ASCWngds3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
var Temp = Context.Measure( String.fromCharCode( 0x0038 ) );
// Почему-то в шрифте Wingding 3 символ 0x0038 имеет неправильную ширину
......@@ -3035,7 +3035,7 @@ ParaTab.prototype =
{
var X0 = this.Width / 2 - this.RealWidth / 2;
Context.SetFont( {FontFamily: { Name : "Wingdings 3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
Context.SetFont( {FontFamily: { Name : "ASCWngds3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
if ( X0 > 0 )
Context.FillText2( X + X0, Y, String.fromCharCode( tab_Symbol ), 0, this.Width );
......@@ -3046,7 +3046,7 @@ ParaTab.prototype =
Measure : function (Context)
{
Context.SetFont( {FontFamily: { Name : "Wingdings 3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
Context.SetFont( {FontFamily: { Name : "ASCWngds3", Index : -1 }, FontSize: 10, Italic: false, Bold : false} );
this.RealWidth = Context.Measure( String.fromCharCode( tab_Symbol ) ).Width;
},
......
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