Skip to content

Commit

Permalink
More title polish (#49340)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrmarti committed Jun 20, 2018
1 parent edb49f6 commit b705856
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
15 changes: 4 additions & 11 deletions src/vs/workbench/browser/parts/quickinput/quickInput.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,28 @@

.quick-input-left-action-bar {
display: flex;
margin-left: 6px;
margin-left: 4px;
flex: 1;
}

.quick-input-left-action-bar.monaco-action-bar .actions-container {
justify-content: flex-start;
}

.quick-input-left-action-bar .action-label.icon {
margin: 0 5px 0 0;
}

.quick-input-title {
padding: 3px 0px;
text-align: center;
}

.quick-input-right-action-bar {
display: flex;
margin-right: 6px;
margin-right: 4px;
flex: 1;
}

.quick-input-right-action-bar .action-label.icon {
margin: 0 0 0 5px;
}

.quick-input-titlebar .monaco-action-bar .action-label.icon {
width: 16px;
margin: 0;
width: 19px;
height: 100%;
background-position: center;
background-repeat: no-repeat;
Expand Down
5 changes: 5 additions & 0 deletions src/vs/workbench/browser/parts/quickinput/quickInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { ActionBar, ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
import { Action } from 'vs/base/common/actions';
import URI from 'vs/base/common/uri';
import { IdGenerator } from 'vs/base/common/idGenerator';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';

const $ = dom.$;

Expand Down Expand Up @@ -710,6 +711,7 @@ export class QuickInputService extends Component implements IQuickInputService {
@IPartService private partService: IPartService,
@IQuickOpenService private quickOpenService: IQuickOpenService,
@IEditorGroupsService private editorGroupService: IEditorGroupsService,
@IKeybindingService private keybindingService: IKeybindingService,
@IContextKeyService contextKeyService: IContextKeyService,
@IThemeService themeService: IThemeService
) {
Expand Down Expand Up @@ -1037,6 +1039,9 @@ export class QuickInputService extends Component implements IQuickInputService {
this.ui.list.matchOnDetail = false;
this.ui.ignoreFocusOut = false;

const keybinding = this.keybindingService.lookupKeybinding(BackAction.ID);
backButton.tooltip = keybinding ? localize('quickInput.backWithKeybinding', "Back ({0})", keybinding.getLabel()) : localize('quickInput.back', "Back");

this.inQuickOpen('quickInput', true);

this.ui.container.style.display = '';
Expand Down

0 comments on commit b705856

Please sign in to comment.