Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

show terminal find history placeholder on focus #150409

Merged
merged 3 commits into from May 25, 2022
Merged

show terminal find history placeholder on focus #150409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28e85e3
fix #148135
meganrogge May 25, 2022
474d43c
fix width
meganrogge May 25, 2022
76488d5
min-width -> width
meganrogge May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.css
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
position: absolute;
top: 0;
right: 18px;
width: 220px;
width: 360px;
max-width: calc(100% - 28px - 28px - 8px);
pointer-events: none;
padding: 0 10px 10px;
Expand All @@ -29,6 +29,7 @@
align-items: center;
pointer-events: all;
transition: top 200ms linear;
min-width: 360px;
}

.monaco-workbench.reduce-motion .monaco-editor .find-widget {
Expand All @@ -45,6 +46,7 @@

.monaco-workbench .simple-find-part .monaco-findInput {
flex: 1;
min-width: 220px;
meganrogge marked this conversation as resolved.
Show resolved Hide resolved
}

.monaco-workbench .simple-find-part .button {
Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
import * as strings from 'vs/base/common/strings';
import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { showHistoryKeybindingHint } from 'vs/platform/history/browser/historyWidgetKeybindingHint';

const NLS_FIND_INPUT_LABEL = nls.localize('label.find', "Find");
const NLS_FIND_INPUT_PLACEHOLDER = nls.localize('placeholder.find', "Find (\u21C5 for history)");
Expand Down Expand Up @@ -80,9 +81,9 @@ export abstract class SimpleFindWidget extends Widget {
},
appendCaseSensitiveLabel: options.appendCaseSensitiveLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindCaseSensitive) : undefined,
appendRegexLabel: options.appendRegexLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindRegex) : undefined,
appendWholeWordsLabel: options.appendWholeWordsLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindWholeWord) : undefined
appendWholeWordsLabel: options.appendWholeWordsLabel && options.type === 'Terminal' ? this._getKeybinding(TerminalCommandId.ToggleFindWholeWord) : undefined,
showHistoryHint: () => showHistoryKeybindingHint(_keybindingService)
meganrogge marked this conversation as resolved.
Show resolved Hide resolved
}, contextKeyService, options.showOptionButtons));

// Find History with update delayer
this._updateHistoryDelayer = new Delayer<void>(500);

Expand Down