ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
View File

@@ -124,12 +124,6 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
this.selectElement = document.createElement('select');
// Workaround for Electron 2.x
// Native select should not require explicit role attribute, however, Electron 2.x
// incorrectly exposes select as menuItem which interferes with labeling and results
// in the unlabeled not been read. Electron 3 appears to fix.
this.selectElement.setAttribute('role', 'combobox');
// Use custom CSS vars for padding calculation
this.selectElement.className = 'monaco-select-box monaco-select-box-dropdown-padding';
@@ -430,6 +424,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
// ContextView dropdown methods
private showSelectDropDown() {
this.selectionDetailsPane.innerText = '';
if (!this.contextViewProvider || this._isVisible) {
return;
@@ -439,8 +434,6 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
this.createSelectList(this.selectDropDownContainer);
this.setOptionsList();
this.cloneElementFont(this.selectElement, this.selectDropDownContainer);
// This allows us to flip the position based on measurement
// Set drop-down position above/below from required height and margins
// If pre-layout cannot fit at least one option do not show drop-down
@@ -581,7 +574,8 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
this.selectDropDownContainer.style.width = selectOptimalWidth;
// Get initial list height and determine space ab1you knowove and below
// Get initial list height and determine space above and below
this.selectList.getHTMLElement().style.height = '';
this.selectList.layout();
let listHeight = this.selectList.contentHeight;
@@ -680,6 +674,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
if (this._hasDetails) {
// Leave the selectDropDownContainer to size itself according to children (list + details) - #57447
this.selectList.getHTMLElement().style.height = (listHeight + verticalPadding) + 'px';
this.selectDropDownContainer.style.height = '';
} else {
this.selectDropDownContainer.style.height = (listHeight + verticalPadding) + 'px';
}
@@ -720,13 +715,6 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
return elementWidth;
}
private cloneElementFont(source: HTMLElement, target: HTMLElement) {
const fontSize = window.getComputedStyle(source, null).getPropertyValue('font-size');
const fontFamily = window.getComputedStyle(source, null).getPropertyValue('font-family');
target.style.fontFamily = fontFamily;
target.style.fontSize = fontSize;
}
private createSelectList(parent: HTMLElement): void {
// If we have already constructive list on open, skip