Skip to content

Enable minimap in defer window mode #144

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

Open
wants to merge 1 commit into
base: switch-to-defer
Choose a base branch
from
Open

Enable minimap in defer window mode #144

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
14 changes: 3 additions & 11 deletions packages/notebook-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3604,9 +3604,7 @@ function addCommands(

commands.addCommand(CommandIDs.virtualScrollbar, {
label: trans.__('Show Minimap'),
caption: trans.__(
'Show Minimap (virtual scrollbar, enabled with windowing mode: full)'
),
caption: trans.__('Show Minimap'),
execute: args => {
const current = getCurrent(tracker, shell, args);

Expand All @@ -3616,20 +3614,14 @@ function addCommands(
},
icon: args => (args.toolbar ? tableRowsIcon : undefined),
isEnabled: args => {
const enabled =
(args.toolbar ? true : isEnabled()) &&
(settings?.composite.windowingMode === 'full' ?? false);
return enabled;
return args.toolbar ? true : isEnabled();
},
isToggled: () => {
const current = tracker.currentWidget;
return current?.content.scrollbar ?? false;
},
isVisible: args => {
const visible =
(args.toolbar ? true : isEnabled()) &&
(settings?.composite.windowingMode === 'full' ?? false);
return visible;
return args.toolbar ? true : isEnabled();
}
});

Expand Down
14 changes: 3 additions & 11 deletions packages/ui-components/src/components/windowedlist.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,17 +452,9 @@ export abstract class WindowedListModel implements WindowedList.IModel {
* @returns The current items range to display
*/
getRangeToRender(): WindowedList.WindowIndex | null {
let newWindowIndex: [number, number, number, number] = [
0,
Math.max(this.widgetCount - 1, -1),
0,
Math.max(this.widgetCount - 1, -1)
];
const newWindowIndex = this._getRangeToRender();

const previousLastMeasuredIndex = this._measuredAllUntilIndex;
if (this.windowingActive) {
newWindowIndex = this._getRangeToRender();
}
const [startIndex, stopIndex] = newWindowIndex;

if (
Expand Down Expand Up @@ -1824,10 +1816,10 @@ export class WindowedLayout extends PanelLayout {
*
* #### Notes
* This is a reimplementation of the base class method,
* and is a no-op.
*/
protected onUpdateRequest(msg: Message): void {
// This is a no-op.
// @ts-ignore
this.parent?._update();
Copy link
Author

@martinRenou martinRenou Jul 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is obviously hacky.

We can't call this.parent.update() since it would result in an infinite update loop.

Happy to discuss a better approach though. Maybe introducing a new public rerender method in the parent?

Copy link
Owner

@krassowski krassowski Jul 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think adding rerender sounds fine if required.

}
}

Expand Down
Loading