Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
31a5bbd1
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,发现更多精彩内容 >>
提交
31a5bbd1
编写于
7月 06, 2016
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add terminal.integrated.fontLigatures setting
Fixes #7541
上级
8ce9b8a4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
0 deletion
+19
-0
src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
...workbench/parts/terminal/electron-browser/media/xterm.css
+8
-0
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
.../parts/terminal/electron-browser/terminal.contribution.ts
+5
-0
src/vs/workbench/parts/terminal/electron-browser/terminal.ts
src/vs/workbench/parts/terminal/electron-browser/terminal.ts
+1
-0
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
...h/parts/terminal/electron-browser/terminalConfigHelper.ts
+4
-0
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
...orkbench/parts/terminal/electron-browser/terminalPanel.ts
+1
-0
未找到文件。
src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
浏览文件 @
31a5bbd1
...
@@ -3,6 +3,14 @@
...
@@ -3,6 +3,14 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
*--------------------------------------------------------------------------------------------*/
.monaco-workbench
.panel.integrated-terminal
{
font-feature-settings
:
"liga"
0
;
}
.monaco-workbench
.panel.integrated-terminal.enable-ligatures
{
font-feature-settings
:
"liga"
1
;
}
.monaco-workbench
.panel.integrated-terminal
.xterm
{
.monaco-workbench
.panel.integrated-terminal
.xterm
{
background-color
:
transparent
!important
;
background-color
:
transparent
!important
;
position
:
relative
;
position
:
relative
;
...
...
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
浏览文件 @
31a5bbd1
...
@@ -59,6 +59,11 @@ configurationRegistry.registerConfiguration({
...
@@ -59,6 +59,11 @@ configurationRegistry.registerConfiguration({
'
description
'
:
nls
.
localize
(
'
terminal.integrated.fontFamily
'
,
"
Controls the font family of the terminal, this defaults to editor.fontFamily's value.
"
),
'
description
'
:
nls
.
localize
(
'
terminal.integrated.fontFamily
'
,
"
Controls the font family of the terminal, this defaults to editor.fontFamily's value.
"
),
'
type
'
:
'
string
'
'
type
'
:
'
string
'
},
},
'
terminal.integrated.fontLigatures
'
:
{
'
description
'
:
nls
.
localize
(
'
terminal.integrated.fontLigatures
'
,
"
Controls whether font ligatures are enabled in the terminal.
"
),
'
type
'
:
'
boolean
'
,
'
default
'
:
false
},
'
terminal.integrated.fontSize
'
:
{
'
terminal.integrated.fontSize
'
:
{
'
description
'
:
nls
.
localize
(
'
terminal.integrated.fontSize
'
,
"
Controls the font size of the terminal, this defaults to editor.fontSize's value.
"
),
'
description
'
:
nls
.
localize
(
'
terminal.integrated.fontSize
'
,
"
Controls the font size of the terminal, this defaults to editor.fontSize's value.
"
),
'
type
'
:
'
number
'
,
'
type
'
:
'
number
'
,
...
...
src/vs/workbench/parts/terminal/electron-browser/terminal.ts
浏览文件 @
31a5bbd1
...
@@ -35,6 +35,7 @@ export interface ITerminalConfiguration {
...
@@ -35,6 +35,7 @@ export interface ITerminalConfiguration {
osx
:
string
[]
osx
:
string
[]
},
},
fontFamily
:
string
,
fontFamily
:
string
,
fontLigatures
:
boolean
,
fontSize
:
number
,
fontSize
:
number
,
lineHeight
:
number
lineHeight
:
number
}
}
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
浏览文件 @
31a5bbd1
...
@@ -137,6 +137,10 @@ export class TerminalConfigHelper {
...
@@ -137,6 +137,10 @@ export class TerminalConfigHelper {
return
this
.
measureFont
(
fontFamily
,
fontSize
+
'
px
'
,
lineHeight
===
0
?
'
normal
'
:
lineHeight
+
'
px
'
);
return
this
.
measureFont
(
fontFamily
,
fontSize
+
'
px
'
,
lineHeight
===
0
?
'
normal
'
:
lineHeight
+
'
px
'
);
}
}
public
getFontLigaturesEnabled
():
boolean
{
return
this
.
configurationService
.
getConfiguration
<
ITerminalConfiguration
>
().
terminal
.
integrated
.
fontLigatures
;
}
public
getCursorBlink
():
boolean
{
public
getCursorBlink
():
boolean
{
let
editorConfig
=
this
.
configurationService
.
getConfiguration
<
IConfiguration
>
();
let
editorConfig
=
this
.
configurationService
.
getConfiguration
<
IConfiguration
>
();
return
editorConfig
.
editor
.
cursorBlinking
===
'
blink
'
;
return
editorConfig
.
editor
.
cursorBlinking
===
'
blink
'
;
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
浏览文件 @
31a5bbd1
...
@@ -201,6 +201,7 @@ export class TerminalPanel extends Panel {
...
@@ -201,6 +201,7 @@ export class TerminalPanel extends Panel {
return
;
return
;
}
}
this
.
terminalInstances
[
this
.
terminalService
.
getActiveTerminalIndex
()].
setFont
(
this
.
configurationHelper
.
getFont
());
this
.
terminalInstances
[
this
.
terminalService
.
getActiveTerminalIndex
()].
setFont
(
this
.
configurationHelper
.
getFont
());
DOM
.
toggleClass
(
this
.
parentDomElement
,
'
enable-ligatures
'
,
this
.
configurationHelper
.
getFontLigaturesEnabled
());
this
.
layout
(
new
Dimension
(
this
.
parentDomElement
.
offsetWidth
,
this
.
parentDomElement
.
offsetHeight
));
this
.
layout
(
new
Dimension
(
this
.
parentDomElement
.
offsetWidth
,
this
.
parentDomElement
.
offsetHeight
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录