Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
709eabfc
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
709eabfc
编写于
1月 25, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #19273: Reading character widths from canvas is unreliable also in Chrome
上级
da2e9f41
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
1 addition
and
79 deletion
+1
-79
src/vs/editor/browser/config/charWidthReader.ts
src/vs/editor/browser/config/charWidthReader.ts
+1
-79
未找到文件。
src/vs/editor/browser/config/charWidthReader.ts
浏览文件 @
709eabfc
...
...
@@ -4,8 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
browser
from
'
vs/base/browser/browser
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
{
BareFontInfo
}
from
'
vs/editor/common/config/fontInfo
'
;
export
const
enum
CharWidthRequestType
{
...
...
@@ -152,83 +150,7 @@ class DomCharWidthReader implements ICharWidthReader {
}
}
class
CanvasCharWidthReader
implements
ICharWidthReader
{
private
readonly
_bareFontInfo
:
BareFontInfo
;
private
readonly
_requests
:
CharWidthRequest
[];
constructor
(
bareFontInfo
:
BareFontInfo
,
requests
:
CharWidthRequest
[])
{
this
.
_bareFontInfo
=
bareFontInfo
;
this
.
_requests
=
requests
;
}
public
read
():
void
{
let
canvasElement
=
<
HTMLCanvasElement
>
document
.
createElement
(
'
canvas
'
);
let
context
=
canvasElement
.
getContext
(
'
2d
'
);
context
.
font
=
CanvasCharWidthReader
.
_createFontString
(
this
.
_bareFontInfo
);
for
(
let
i
=
0
,
len
=
this
.
_requests
.
length
;
i
<
len
;
i
++
)
{
const
request
=
this
.
_requests
[
i
];
if
(
request
.
type
===
CharWidthRequestType
.
Regular
)
{
request
.
fulfill
(
context
.
measureText
(
request
.
chr
).
width
);
}
}
context
.
font
=
CanvasCharWidthReader
.
_createFontString
(
this
.
_bareFontInfo
,
undefined
,
'
bold
'
);
for
(
let
i
=
0
,
len
=
this
.
_requests
.
length
;
i
<
len
;
i
++
)
{
const
request
=
this
.
_requests
[
i
];
if
(
request
.
type
===
CharWidthRequestType
.
Bold
)
{
request
.
fulfill
(
context
.
measureText
(
request
.
chr
).
width
);
}
}
context
.
font
=
CanvasCharWidthReader
.
_createFontString
(
this
.
_bareFontInfo
,
'
italic
'
);
for
(
let
i
=
0
,
len
=
this
.
_requests
.
length
;
i
<
len
;
i
++
)
{
const
request
=
this
.
_requests
[
i
];
if
(
request
.
type
===
CharWidthRequestType
.
Italic
)
{
request
.
fulfill
(
context
.
measureText
(
request
.
chr
).
width
);
}
}
}
private
static
_createFontString
(
bareFontInfo
:
BareFontInfo
,
overwriteFontStyle
:
string
=
'
normal
'
,
overwriteFontWeight
:
string
=
bareFontInfo
.
fontWeight
):
string
{
return
this
.
_doCreateFontString
(
overwriteFontStyle
,
overwriteFontWeight
,
bareFontInfo
.
fontSize
,
bareFontInfo
.
lineHeight
,
bareFontInfo
.
fontFamily
);
}
private
static
_doCreateFontString
(
fontStyle
:
string
,
fontWeight
:
string
,
fontSize
:
number
,
lineHeight
:
number
,
fontFamily
:
string
):
string
{
// The full font syntax is:
// style | variant | weight | stretch | size/line-height | fontFamily
// (https://developer.mozilla.org/en-US/docs/Web/CSS/font)
// But it appears Edge and IE11 cannot properly parse `stretch`.
return
`
${
fontStyle
}
normal
${
fontWeight
}
${
fontSize
}
px /
${
lineHeight
}
px
${
fontFamily
}
`
;
}
}
function
readCharWidthsFromDom
(
bareFontInfo
:
BareFontInfo
,
requests
:
CharWidthRequest
[]):
void
{
export
function
readCharWidths
(
bareFontInfo
:
BareFontInfo
,
requests
:
CharWidthRequest
[]):
void
{
let
reader
=
new
DomCharWidthReader
(
bareFontInfo
,
requests
);
reader
.
read
();
}
function
readCharWidthsFromCanvas
(
bareFontInfo
:
BareFontInfo
,
requests
:
CharWidthRequest
[]):
void
{
let
reader
=
new
CanvasCharWidthReader
(
bareFontInfo
,
requests
);
reader
.
read
();
}
export
function
readCharWidths
(
bareFontInfo
:
BareFontInfo
,
requests
:
CharWidthRequest
[]):
void
{
// In IE11 and Firefox, it appears that ctx.measureText() always returns integer results.
// In Edge, ctx.measureText() gives floating point results, but they are not the same.
// In Safari, ctx.measureText() also gives floating point results, but they are not the same.
if
(
browser
.
isIE
||
browser
.
isFirefox
||
browser
.
isSafari
)
{
readCharWidthsFromDom
(
bareFontInfo
,
requests
);
return
;
}
// On Linux, it appears that ctx.measureText() is unaffected by the browser zoom (which is correct),
// but the char widths at rendering time are affected by the browser zoom (which is unexpected)
if
(
platform
.
isLinux
)
{
readCharWidthsFromDom
(
bareFontInfo
,
requests
);
return
;
}
readCharWidthsFromCanvas
(
bareFontInfo
,
requests
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录