提交 d5897c06 编写于 作者: S Sandeep Somavarapu

Fix #16529

上级 249ae129
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style>.icon-canvas-transparent{opacity:0;fill:#f6f6f6}.icon-vs-out{fill:#f6f6f6}.icon-vs-bg{fill:#424242}.icon-vs-fg{fill:#f0eff1}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-bg" d="M11 11v-1h2V2H7v2H6V1h8v10h-3zm-1-6v10H2V5h8zM9 6H3v8h6V6z" id="iconBg"/></svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style>.icon-canvas-transparent{opacity:0;fill:#2d2d30}.icon-vs-out{fill:#2d2d30}.icon-vs-bg{fill:#c5c5c5}.icon-vs-fg{fill:#2b282e}</style><path class="icon-canvas-transparent" d="M16 16H0V0h16v16z" id="canvas"/><path class="icon-vs-bg" d="M11 11v-1h2V2H7v2H6V1h8v10h-3zm-1-6v10H2V5h8zM9 6H3v8h6V6z" id="iconBg"/></svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 4.28l-11.673 11.72h-4.327v-4.406l11.477-11.594h.308l4.215 4.237v.043z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M14.598 4.25l-1.688 1.75-3-3 1.688-1.75 3 3zm-5.688-.25l-7 7 3 3 7-7-3-3zm-7.91 8.09v2.91h2.91l-2.91-2.91z" id="iconBg"/></svg>
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#2d2d30;} .icon-vs-out{fill:#2d2d30;} .icon-vs-bg{fill:#c5c5c5;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 4.28l-11.673 11.72h-4.327v-4.406l11.477-11.594h.308l4.215 4.237v.043z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M14.598 4.25l-1.688 1.75-3-3 1.688-1.75 3 3zm-5.688-.25l-7 7 3 3 7-7-3-3zm-7.91 8.09v2.91h2.91l-2.91-2.91z" id="iconBg"/></svg>
\ No newline at end of file
......@@ -148,7 +148,7 @@
.monaco-editor .view-line:hover :not(.inline-folded).copySetting:after {
cursor: pointer;
content:" ";
background: url('copy.svg') center center no-repeat;
background: url('edit.svg') center center no-repeat;
margin-left: 1em;
display:inline-block;
position: absolute;
......@@ -158,7 +158,7 @@
.monaco-editor.hc-black .view-line:hover :not(.inline-folded).copySetting:after,
.monaco-editor.vs-dark .view-line:hover :not(.inline-folded).copySetting:after {
background: url('copy_inverse.svg') center center no-repeat;
background: url('edit_inverse.svg') center center no-repeat;
}
.monaco-editor .floating-click-widget {
......
......@@ -878,16 +878,12 @@ export class CopySettingActionRenderer extends Disposable {
if (setting) {
let jsonSchema: IJSONSchema = this.getConfigurationsMap()[setting.key];
const actions = this.getActions(setting, jsonSchema);
if (actions) {
let elementPosition = DOM.getDomNodePagePosition(<HTMLElement>e.target.element);
const anchor = { x: elementPosition.left, y: elementPosition.top + elementPosition.height + 10 };
this.contextMenuService.showContextMenu({
getAnchor: () => anchor,
getActions: () => TPromise.wrap(actions)
});
return;
}
this.settingsService.copyConfiguration(setting);
let elementPosition = DOM.getDomNodePagePosition(<HTMLElement>e.target.element);
const anchor = { x: elementPosition.left, y: elementPosition.top + elementPosition.height + 10 };
this.contextMenuService.showContextMenu({
getAnchor: () => anchor,
getActions: () => TPromise.wrap(actions)
});
}
}
......@@ -930,7 +926,12 @@ export class CopySettingActionRenderer extends Disposable {
};
});
}
return null;
return [<IAction>{
id: 'copyToSettings',
label: nls.localize('copyToSettings', "Copy to settings"),
enabled: true,
run: () => this.settingsService.copyConfiguration(setting)
}];
}
public dispose() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册