ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-07 11:01:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix profiler not launch issue (#10757)

Browse Source
This commit is contained in:
Alan Ren
2020-06-05 15:41:29 -07:00
committed by GitHub
parent 919275dadc
commit 3500ce08cc
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/workbench/contrib/notebook/browser/find/notebookFindWidget.ts
View File

@@ -452,9 +452,12 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
let findPart = document.createElement('div'); let findPart = document.createElement('div');
findPart.className = 'find-part'; findPart.className = 'find-part';
findPart.appendChild(this._findInput.domNode); findPart.appendChild(this._findInput.domNode);
findPart.appendChild(this._matchesCount); let actionsContainer = document.createElement('div');
findPart.appendChild(this._prevBtn.domNode); findPart.appendChild(actionsContainer);
findPart.appendChild(this._nextBtn.domNode); actionsContainer.className = 'find-actions';
actionsContainer.appendChild(this._matchesCount);
actionsContainer.appendChild(this._prevBtn.domNode);
actionsContainer.appendChild(this._nextBtn.domNode);
// Close button // Close button
this._closeBtn = this._register(new SimpleButton({ this._closeBtn = this._register(new SimpleButton({
@@ -466,7 +469,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashL
onKeyDown: () => { } onKeyDown: () => { }
})); }));
findPart.appendChild(this._closeBtn.domNode); actionsContainer.appendChild(this._closeBtn.domNode);
return findPart; return findPart;
} }

29
src/sql/workbench/contrib/profiler/browser/profilerFindWidget.ts
View File

@@ -15,7 +15,7 @@ import { IContextViewProvider } from 'vs/base/browser/ui/contextview/contextview
import { FindInput, IFindInputStyles } from 'vs/base/browser/ui/findinput/findInput'; import { FindInput, IFindInputStyles } from 'vs/base/browser/ui/findinput/findInput';
import { IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox'; import { IMessage as InputBoxMessage } from 'vs/base/browser/ui/inputbox/inputBox';
import { Widget } from 'vs/base/browser/ui/widget'; import { Widget } from 'vs/base/browser/ui/widget';
import { Sash, IHorizontalSashLayoutProvider, ISashEvent, Orientation } from 'vs/base/browser/ui/sash/sash'; import { Sash, ISashEvent, Orientation, IVerticalSashLayoutProvider } from 'vs/base/browser/ui/sash/sash';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser'; import { IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
import { FIND_IDS, CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/findModel'; import { FIND_IDS, CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/findModel';
@@ -61,7 +61,7 @@ export interface IConfigurationChangedEvent {
layoutInfo?: boolean; layoutInfo?: boolean;
} }
export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSashLayoutProvider { export class FindWidget extends Widget implements IOverlayWidget, IVerticalSashLayoutProvider {
private static ID = 'editor.contrib.findWidget'; private static ID = 'editor.contrib.findWidget';
private _tableController: ITableController; private _tableController: ITableController;
private _state: FindReplaceState; private _state: FindReplaceState;
@@ -349,15 +349,9 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
} }
// ----- sash // ----- sash
public getHorizontalSashTop(sash: Sash): number { public getVerticalSashLeft(sash: Sash): number {
return 0; return 0;
} }
public getHorizontalSashLeft?(sash: Sash): number {
return 0;
}
public getHorizontalSashWidth?(sash: Sash): number {
return 500;
}
// ----- initialization // ----- initialization
@@ -427,7 +421,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
// Previous button // Previous button
this._prevBtn = this._register(new SimpleButton({ this._prevBtn = this._register(new SimpleButton({
label: NLS_PREVIOUS_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.PreviousMatchFindAction), label: NLS_PREVIOUS_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.PreviousMatchFindAction),
className: 'previous', className: 'codicon codicon-arrow-up',
onTrigger: () => { onTrigger: () => {
this._tableController.getAction(ACTION_IDS.FIND_PREVIOUS).run().then(null, onUnexpectedError); this._tableController.getAction(ACTION_IDS.FIND_PREVIOUS).run().then(null, onUnexpectedError);
}, },
@@ -437,7 +431,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
// Next button // Next button
this._nextBtn = this._register(new SimpleButton({ this._nextBtn = this._register(new SimpleButton({
label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction), label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction),
className: 'next', className: 'codicon codicon-arrow-down',
onTrigger: () => { onTrigger: () => {
this._tableController.getAction(ACTION_IDS.FIND_NEXT).run().then(null, onUnexpectedError); this._tableController.getAction(ACTION_IDS.FIND_NEXT).run().then(null, onUnexpectedError);
}, },
@@ -447,21 +441,24 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
let findPart = document.createElement('div'); let findPart = document.createElement('div');
findPart.className = 'find-part'; findPart.className = 'find-part';
findPart.appendChild(this._findInput.domNode); findPart.appendChild(this._findInput.domNode);
findPart.appendChild(this._matchesCount); let actionsContainer = document.createElement('div');
findPart.appendChild(this._prevBtn.domNode); findPart.appendChild(actionsContainer);
findPart.appendChild(this._nextBtn.domNode); actionsContainer.className = 'find-actions';
actionsContainer.appendChild(this._matchesCount);
actionsContainer.appendChild(this._prevBtn.domNode);
actionsContainer.appendChild(this._nextBtn.domNode);
// Close button // Close button
this._closeBtn = this._register(new SimpleButton({ this._closeBtn = this._register(new SimpleButton({
label: NLS_CLOSE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.CloseFindWidgetCommand), label: NLS_CLOSE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.CloseFindWidgetCommand),
className: 'close-fw', className: 'codicon codicon-close',
onTrigger: () => { onTrigger: () => {
this._state.change({ isRevealed: false, searchScope: null }, false); this._state.change({ isRevealed: false, searchScope: null }, false);
}, },
onKeyDown: () => { } onKeyDown: () => { }
})); }));
findPart.appendChild(this._closeBtn.domNode); actionsContainer.appendChild(this._closeBtn.domNode);
return findPart; return findPart;
} }