Skip to content

Demo Work #95

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

Merged
iamseeley merged 1 commit into from
Apr 17, 2026
Merged

Demo Work #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions extensions/theme-defaults/themes/membrane_dark.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"include": "./dark_modern.json",
"colors": {
"sash.hoverBorder": "#808080",
"editor.selectionBackground": "#ff800033",
"editor.hoverHighlightBackground": "#ff800033",
"editor.wordHighlightBackground": "#ff800033",
"editor.wordHighlightStrongBackground": "#ff800044",
"editorCodeLens.foreground": "#845bff",
"menu.selectionBackground": "#2a2a2a",
"menu.border": "#282828",
Expand Down
4 changes: 4 additions & 0 deletions extensions/theme-defaults/themes/membrane_light.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"include": "./light_modern.json",
"colors": {
"sash.hoverBorder": "#999",
"editor.selectionBackground": "#ff800033",
"editor.hoverHighlightBackground": "#ff800033",
"editor.wordHighlightBackground": "#ff800033",
"editor.wordHighlightStrongBackground": "#ff800044",
"diffEditor.unchangedRegionBackground": "#efefef",
"activityBar.activeBorder": "#3c3c3c",
"activityBar.background": "#ddd",
Expand Down
3 changes: 2 additions & 1 deletion src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ class Widget {
const underLineTop = anchor.top + anchor.height;
const heightAvailableUnderLine = ctx.viewportHeight - underLineTop;

const aboveTop = aboveLineTop - height;
// MEMBRANE: Clamp aboveTop to 0 so hover never escapes above the editor viewport
const aboveTop = Math.max(0, aboveLineTop - height);
const fitsAbove = (heightAvailableAboveLine >= height);
const belowTop = underLineTop;
const fitsBelow = (heightAvailableUnderLine >= height);
Expand Down
3 changes: 2 additions & 1 deletion src/vs/editor/contrib/hover/browser/resizableContentWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const BOTTOM_HEIGHT = 24;

export abstract class ResizableContentWidget extends Disposable implements IContentWidget {

readonly allowEditorOverflow: boolean = true;
// MEMBRANE: Keep hover within editor bounds to prevent overflow outside the visible area
readonly allowEditorOverflow: boolean = false;
readonly suppressMouseDown: boolean = false;

protected readonly _resizableNode = this._register(new ResizableHTMLElement());
Expand Down
11 changes: 6 additions & 5 deletions src/vs/editor/contrib/multicursor/browser/multicursor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,11 +767,12 @@ export class SelectHighlightsAction extends MultiCursorSelectionControllerAction
id: 'editor.action.selectHighlights',
label: nls.localize2('selectAllOccurrencesOfFindMatch', "Select All Occurrences of Find Match"),
precondition: undefined,
kbOpts: {
kbExpr: EditorContextKeys.focus,
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyL,
weight: KeybindingWeight.EditorContrib
},
// MEMBRANE: Disable Cmd+Shift+L keybinding
// kbOpts: {
// kbExpr: EditorContextKeys.focus,
// primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyL,
// weight: KeybindingWeight.EditorContrib
// },
menuOpts: {
menuId: MenuId.MenubarSelectionMenu,
group: '3_multi',
Expand Down
Loading