Skip to content

Commit b2a80a4

Browse files
joaomorenojoaomoreno
committed
1 parent 7b9c3b0 commit b2a80a4

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

‎src/vs/base/browser/ui/list/listView.ts‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
191191
readonly onDidChangeContentHeight: Event<number> = Event.latch(this._onDidChangeContentHeight.event);
192192
get contentHeight(): number { return this.rangeMap.size; }
193193

194-
readonly onDidScroll: Event<void>;
195-
196-
// private _onDragStart = new Emitter<{ element: T, uri: string, event: DragEvent }>();
197-
// readonly onDragStart = this._onDragStart.event;
198-
199-
// readonly onDragOver: Event<IListDragEvent<T>>;
200-
// readonly onDragLeave: Event<void>;
201-
// readonly onDrop: Event<IListDragEvent<T>>;
202-
// readonly onDragEnd: Event<void>;
194+
get onDidScroll(): Event<ScrollEvent> { return this.scrollableElement.onScroll; }
203195

204196
constructor(
205197
container: HTMLElement,
@@ -253,7 +245,6 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
253245

254246
this.disposables = [this.rangeMap, this.gesture, this.scrollableElement, this.cache];
255247

256-
this.onDidScroll = Event.signal(this.scrollableElement.onScroll);
257248
this.scrollableElement.onScroll(this.onScroll, this, this.disposables);
258249
domEvent(this.rowsContainer, TouchEventType.Change)(this.onTouchChange, this, this.disposables);
259250

‎src/vs/base/browser/ui/list/listWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { IListVirtualDelegate, IListRenderer, IListEvent, IListContextMenuEvent,
2020
import { ListView, IListViewOptions, IListViewDragAndDrop, IAriaSetProvider } from './listView';
2121
import { Color } from 'vs/base/common/color';
2222
import { mixin } from 'vs/base/common/objects';
23-
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
23+
import { ScrollbarVisibility, ScrollEvent } from 'vs/base/common/scrollable';
2424
import { ISpliceable } from 'vs/base/common/sequence';
2525
import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
2626
import { clamp } from 'vs/base/common/numbers';
@@ -1112,7 +1112,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
11121112
return Event.map(this._onPin.event, indexes => this.toListEvent({ indexes }));
11131113
}
11141114

1115-
get onDidScroll(): Event<void> { return this.view.onDidScroll; }
1115+
get onDidScroll(): Event<ScrollEvent> { return this.view.onDidScroll; }
11161116
get onMouseClick(): Event<IListMouseEvent<T>> { return this.view.onMouseClick; }
11171117
get onMouseDblClick(): Event<IListMouseEvent<T>> { return this.view.onMouseDblClick; }
11181118
get onMouseMiddleClick(): Event<IListMouseEvent<T>> { return this.view.onMouseMiddleClick; }

‎src/vs/base/browser/ui/tree/abstractTree.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { disposableTimeout } from 'vs/base/common/async';
2424
import { isMacintosh } from 'vs/base/common/platform';
2525
import { values } from 'vs/base/common/map';
2626
import { clamp } from 'vs/base/common/numbers';
27+
import { ScrollEvent } from 'vs/base/common/scrollable';
2728

2829
function asTreeDragAndDropData<T, TFilterData>(data: IDragAndDropData): IDragAndDropData {
2930
if (data instanceof ElementsDragAndDropData) {
@@ -971,7 +972,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
971972
private focusNavigationFilter: ((node: ITreeNode<T, TFilterData>) => boolean) | undefined;
972973
protected disposables: IDisposable[] = [];
973974

974-
get onDidScroll(): Event<void> { return this.view.onDidScroll; }
975+
get onDidScroll(): Event<ScrollEvent> { return this.view.onDidScroll; }
975976

976977
get onDidChangeFocus(): Event<ITreeEvent<T>> { return this.eventBufferer.wrapEvent(this.focus.onDidChange); }
977978
get onDidChangeSelection(): Event<ITreeEvent<T>> { return this.eventBufferer.wrapEvent(this.selection.onDidChange); }

‎src/vs/base/browser/ui/tree/asyncDataTree.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView';
1717
import { isPromiseCanceledError, onUnexpectedError } from 'vs/base/common/errors';
1818
import { toggleClass } from 'vs/base/browser/dom';
1919
import { values } from 'vs/base/common/map';
20+
import { ScrollEvent } from 'vs/base/common/scrollable';
2021

2122
interface IAsyncDataTreeNode<TInput, T> {
2223
element: TInput | T;
@@ -296,7 +297,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
296297

297298
protected readonly disposables: IDisposable[] = [];
298299

299-
get onDidScroll(): Event<void> { return this.tree.onDidScroll; }
300+
get onDidScroll(): Event<ScrollEvent> { return this.tree.onDidScroll; }
300301

301302
get onDidChangeFocus(): Event<ITreeEvent<T>> { return Event.map(this.tree.onDidChangeFocus, asTreeEvent); }
302303
get onDidChangeSelection(): Event<ITreeEvent<T>> { return Event.map(this.tree.onDidChangeSelection, asTreeEvent); }

0 commit comments

Comments
 (0)