提交 b4107923 编写于 作者: A Alex Dima

Fixes #8800: Move ScrollbarVisibility to /common/

上级 9b18dc50
...@@ -61,7 +61,7 @@ export interface ICommandHandler { ...@@ -61,7 +61,7 @@ export interface ICommandHandler {
#include(vs/editor/browser/standalone/standaloneServices): IEditorOverrideServices #include(vs/editor/browser/standalone/standaloneServices): IEditorOverrideServices
#include(vs/platform/markers/common/markers): IMarkerData #include(vs/platform/markers/common/markers): IMarkerData
#include(vs/editor/browser/standalone/colorizer): IColorizerOptions, IColorizerElementOptions #include(vs/editor/browser/standalone/colorizer): IColorizerOptions, IColorizerElementOptions
#include(vs/base/browser/ui/scrollbar/scrollableElementOptions): ScrollbarVisibility #include(vs/base/common/scrollable): ScrollbarVisibility
#include(vs/base/common/actions): IAction #include(vs/base/common/actions): IAction
#includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode): IPosition, IRange, ISelection, SelectionDirection, IScrollEvent #includeAll(vs/editor/common/editorCommon;IMode=>languages.IMode): IPosition, IRange, ISelection, SelectionDirection, IScrollEvent
#includeAll(vs/editor/browser/editorBrowser;editorCommon.=>): #includeAll(vs/editor/browser/editorBrowser;editorCommon.=>):
......
...@@ -8,7 +8,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; ...@@ -8,7 +8,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { Gesture } from 'vs/base/browser/touch'; import { Gesture } from 'vs/base/browser/touch';
import * as DOM from 'vs/base/browser/dom'; import * as DOM from 'vs/base/browser/dom';
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
import { ScrollbarVisibility } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { RangeMap, IRange, relativeComplement, each } from './rangeMap'; import { RangeMap, IRange, relativeComplement, each } from './rangeMap';
import { IDelegate, IRenderer } from './list'; import { IDelegate, IRenderer } from './list';
import { RowCache, IRow } from './rowCache'; import { RowCache, IRow } from './rowCache';
......
...@@ -13,8 +13,7 @@ import {FastDomNode, createFastDomNode} from 'vs/base/browser/styleMutator'; ...@@ -13,8 +13,7 @@ import {FastDomNode, createFastDomNode} from 'vs/base/browser/styleMutator';
import {ScrollbarState} from 'vs/base/browser/ui/scrollbar/scrollbarState'; import {ScrollbarState} from 'vs/base/browser/ui/scrollbar/scrollbarState';
import {ScrollbarArrow, ScrollbarArrowOptions} from 'vs/base/browser/ui/scrollbar/scrollbarArrow'; import {ScrollbarArrow, ScrollbarArrowOptions} from 'vs/base/browser/ui/scrollbar/scrollbarArrow';
import {ScrollbarVisibilityController} from 'vs/base/browser/ui/scrollbar/scrollbarVisibilityController'; import {ScrollbarVisibilityController} from 'vs/base/browser/ui/scrollbar/scrollbarVisibilityController';
import {Scrollable} from 'vs/base/common/scrollable'; import {Scrollable, ScrollbarVisibility} from 'vs/base/common/scrollable';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
/** /**
* The orthogonal distance to the slider at which dragging "resets". This implements "snapping" * The orthogonal distance to the slider at which dragging "resets". This implements "snapping"
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
import {AbstractScrollbar, ScrollbarHost, IMouseMoveEventData} from 'vs/base/browser/ui/scrollbar/abstractScrollbar'; import {AbstractScrollbar, ScrollbarHost, IMouseMoveEventData} from 'vs/base/browser/ui/scrollbar/abstractScrollbar';
import {IMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent'; import {IMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent';
import {IDomNodePagePosition} from 'vs/base/browser/dom'; import {IDomNodePagePosition} from 'vs/base/browser/dom';
import {ScrollbarVisibility, ScrollableElementResolvedOptions} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollableElementResolvedOptions} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
import {Scrollable, ScrollEvent} from 'vs/base/common/scrollable'; import {Scrollable, ScrollEvent, ScrollbarVisibility} from 'vs/base/common/scrollable';
import {ScrollbarState} from 'vs/base/browser/ui/scrollbar/scrollbarState'; import {ScrollbarState} from 'vs/base/browser/ui/scrollbar/scrollbarState';
import {ARROW_IMG_SIZE} from 'vs/base/browser/ui/scrollbar/scrollbarArrow'; import {ARROW_IMG_SIZE} from 'vs/base/browser/ui/scrollbar/scrollbarArrow';
......
...@@ -12,9 +12,9 @@ import * as Platform from 'vs/base/common/platform'; ...@@ -12,9 +12,9 @@ import * as Platform from 'vs/base/common/platform';
import {StandardMouseWheelEvent, IMouseEvent} from 'vs/base/browser/mouseEvent'; import {StandardMouseWheelEvent, IMouseEvent} from 'vs/base/browser/mouseEvent';
import {HorizontalScrollbar} from 'vs/base/browser/ui/scrollbar/horizontalScrollbar'; import {HorizontalScrollbar} from 'vs/base/browser/ui/scrollbar/horizontalScrollbar';
import {VerticalScrollbar} from 'vs/base/browser/ui/scrollbar/verticalScrollbar'; import {VerticalScrollbar} from 'vs/base/browser/ui/scrollbar/verticalScrollbar';
import {ScrollbarVisibility, ScrollableElementCreationOptions, ScrollableElementChangeOptions, ScrollableElementResolvedOptions} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollableElementCreationOptions, ScrollableElementChangeOptions, ScrollableElementResolvedOptions} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {Scrollable, ScrollEvent, INewScrollState} from 'vs/base/common/scrollable'; import {Scrollable, ScrollEvent, INewScrollState, ScrollbarVisibility} from 'vs/base/common/scrollable';
import {Widget} from 'vs/base/browser/ui/widget'; import {Widget} from 'vs/base/browser/ui/widget';
import {TimeoutTimer} from 'vs/base/common/async'; import {TimeoutTimer} from 'vs/base/common/async';
import {FastDomNode, createFastDomNode} from 'vs/base/browser/styleMutator'; import {FastDomNode, createFastDomNode} from 'vs/base/browser/styleMutator';
......
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
export enum ScrollbarVisibility { import {ScrollbarVisibility} from 'vs/base/common/scrollable';
Auto = 1,
Hidden = 2,
Visible = 3
}
export interface ScrollableElementCreationOptions { export interface ScrollableElementCreationOptions {
/** /**
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import {Disposable} from 'vs/base/common/lifecycle'; import {Disposable} from 'vs/base/common/lifecycle';
import {TimeoutTimer} from 'vs/base/common/async'; import {TimeoutTimer} from 'vs/base/common/async';
import {FastDomNode} from 'vs/base/browser/styleMutator'; import {FastDomNode} from 'vs/base/browser/styleMutator';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
export class ScrollbarVisibilityController extends Disposable { export class ScrollbarVisibilityController extends Disposable {
private _visibility: ScrollbarVisibility; private _visibility: ScrollbarVisibility;
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
import {AbstractScrollbar, ScrollbarHost, IMouseMoveEventData} from 'vs/base/browser/ui/scrollbar/abstractScrollbar'; import {AbstractScrollbar, ScrollbarHost, IMouseMoveEventData} from 'vs/base/browser/ui/scrollbar/abstractScrollbar';
import {IMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent'; import {IMouseEvent, StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent';
import {IDomNodePagePosition} from 'vs/base/browser/dom'; import {IDomNodePagePosition} from 'vs/base/browser/dom';
import {ScrollbarVisibility, ScrollableElementResolvedOptions} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollableElementResolvedOptions} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
import {Scrollable, ScrollEvent} from 'vs/base/common/scrollable'; import {Scrollable, ScrollEvent, ScrollbarVisibility} from 'vs/base/common/scrollable';
import {ScrollbarState} from 'vs/base/browser/ui/scrollbar/scrollbarState'; import {ScrollbarState} from 'vs/base/browser/ui/scrollbar/scrollbarState';
import {ARROW_IMG_SIZE} from 'vs/base/browser/ui/scrollbar/scrollbarArrow'; import {ARROW_IMG_SIZE} from 'vs/base/browser/ui/scrollbar/scrollbarArrow';
......
...@@ -7,6 +7,12 @@ ...@@ -7,6 +7,12 @@
import {Disposable} from 'vs/base/common/lifecycle'; import {Disposable} from 'vs/base/common/lifecycle';
import Event, {Emitter} from 'vs/base/common/event'; import Event, {Emitter} from 'vs/base/common/event';
export enum ScrollbarVisibility {
Auto = 1,
Hidden = 2,
Visible = 3
}
export interface ScrollEvent { export interface ScrollEvent {
width: number; width: number;
scrollWidth: number; scrollWidth: number;
......
...@@ -27,7 +27,7 @@ import DOM = require('vs/base/browser/dom'); ...@@ -27,7 +27,7 @@ import DOM = require('vs/base/browser/dom');
import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer'; import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer';
import {KeyCode, KeyMod, CommonKeybindings} from 'vs/base/common/keyCodes'; import {KeyCode, KeyMod, CommonKeybindings} from 'vs/base/common/keyCodes';
import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
export interface IQuickOpenCallbacks { export interface IQuickOpenCallbacks {
onOk: () => void; onOk: () => void;
......
...@@ -10,7 +10,7 @@ import Events = require('vs/base/common/eventEmitter'); ...@@ -10,7 +10,7 @@ import Events = require('vs/base/common/eventEmitter');
import Mouse = require('vs/base/browser/mouseEvent'); import Mouse = require('vs/base/browser/mouseEvent');
import Keyboard = require('vs/base/browser/keyboardEvent'); import Keyboard = require('vs/base/browser/keyboardEvent');
import { INavigator } from 'vs/base/common/iterator'; import { INavigator } from 'vs/base/common/iterator';
import { ScrollbarVisibility } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
export interface ITree extends Events.IEventEmitter { export interface ITree extends Events.IEventEmitter {
......
...@@ -18,7 +18,7 @@ import Model = require('vs/base/parts/tree/browser/treeModel'); ...@@ -18,7 +18,7 @@ import Model = require('vs/base/parts/tree/browser/treeModel');
import dnd = require('./treeDnd'); import dnd = require('./treeDnd');
import { ArrayIterator, MappedIterator } from 'vs/base/common/iterator'; import { ArrayIterator, MappedIterator } from 'vs/base/common/iterator';
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
import { ScrollbarVisibility } from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
import { HeightMap } from 'vs/base/parts/tree/browser/treeViewModel'; import { HeightMap } from 'vs/base/parts/tree/browser/treeViewModel';
import _ = require('vs/base/parts/tree/browser/tree'); import _ = require('vs/base/parts/tree/browser/tree');
import { IViewItem } from 'vs/base/parts/tree/browser/treeViewModel'; import { IViewItem } from 'vs/base/parts/tree/browser/treeViewModel';
......
...@@ -10,7 +10,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; ...@@ -10,7 +10,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
import {ContentWidgetPositionPreference, OverlayWidgetPositionPreference} from 'vs/editor/browser/editorBrowser'; import {ContentWidgetPositionPreference, OverlayWidgetPositionPreference} from 'vs/editor/browser/editorBrowser';
import {ShallowCancelThenPromise} from 'vs/base/common/async'; import {ShallowCancelThenPromise} from 'vs/base/common/async';
import {StandaloneEditor, IStandaloneCodeEditor, StandaloneDiffEditor, IStandaloneDiffEditor, startup, IEditorConstructionOptions, IDiffEditorConstructionOptions} from 'vs/editor/browser/standalone/standaloneCodeEditor'; import {StandaloneEditor, IStandaloneCodeEditor, StandaloneDiffEditor, IStandaloneDiffEditor, startup, IEditorConstructionOptions, IDiffEditorConstructionOptions} from 'vs/editor/browser/standalone/standaloneCodeEditor';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
import {IEditorOverrideServices, ensureDynamicPlatformServices, ensureStaticPlatformServices} from 'vs/editor/browser/standalone/standaloneServices'; import {IEditorOverrideServices, ensureDynamicPlatformServices, ensureStaticPlatformServices} from 'vs/editor/browser/standalone/standaloneServices';
import {IDisposable} from 'vs/base/common/lifecycle'; import {IDisposable} from 'vs/base/common/lifecycle';
import URI from 'vs/base/common/uri'; import URI from 'vs/base/common/uri';
......
...@@ -14,7 +14,7 @@ import {Registry} from 'vs/platform/platform'; ...@@ -14,7 +14,7 @@ import {Registry} from 'vs/platform/platform';
import {DefaultConfig, DEFAULT_INDENTATION, DEFAULT_TRIM_AUTO_WHITESPACE, GOLDEN_LINE_HEIGHT_RATIO} from 'vs/editor/common/config/defaultConfig'; import {DefaultConfig, DEFAULT_INDENTATION, DEFAULT_TRIM_AUTO_WHITESPACE, GOLDEN_LINE_HEIGHT_RATIO} from 'vs/editor/common/config/defaultConfig';
import * as editorCommon from 'vs/editor/common/editorCommon'; import * as editorCommon from 'vs/editor/common/editorCommon';
import {EditorLayoutProvider} from 'vs/editor/common/viewLayout/editorLayoutProvider'; import {EditorLayoutProvider} from 'vs/editor/common/viewLayout/editorLayoutProvider';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
// TODO@Alex: investigate if it is better to stick to 31 bits (see smi = SMall Integer) // TODO@Alex: investigate if it is better to stick to 31 bits (see smi = SMall Integer)
// See https://thibaultlaurens.github.io/javascript/2013/04/29/how-the-v8-engine-works/#tagged-values // See https://thibaultlaurens.github.io/javascript/2013/04/29/how-the-v8-engine-works/#tagged-values
......
...@@ -12,7 +12,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; ...@@ -12,7 +12,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import {IInstantiationService, IConstructorSignature1, IConstructorSignature2} from 'vs/platform/instantiation/common/instantiation'; import {IInstantiationService, IConstructorSignature1, IConstructorSignature2} from 'vs/platform/instantiation/common/instantiation';
import {ILineContext, IMode, IToken} from 'vs/editor/common/modes'; import {ILineContext, IMode, IToken} from 'vs/editor/common/modes';
import {ViewLineToken} from 'vs/editor/common/core/viewLineToken'; import {ViewLineToken} from 'vs/editor/common/core/viewLineToken';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
import {IDisposable} from 'vs/base/common/lifecycle'; import {IDisposable} from 'vs/base/common/lifecycle';
import {Position} from 'vs/editor/common/core/position'; import {Position} from 'vs/editor/common/core/position';
import {Range} from 'vs/editor/common/core/range'; import {Range} from 'vs/editor/common/core/range';
......
...@@ -21,7 +21,7 @@ import {ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWi ...@@ -21,7 +21,7 @@ import {ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWi
import {IQuickFix2} from '../common/quickFix'; import {IQuickFix2} from '../common/quickFix';
import {QuickFixModel} from './quickFixModel'; import {QuickFixModel} from './quickFixModel';
import {alert} from 'vs/base/browser/ui/aria/aria'; import {alert} from 'vs/base/browser/ui/aria/aria';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {IDisposable, dispose} from 'vs/base/common/lifecycle';
var $ = dom.emmet; var $ = dom.emmet;
......
...@@ -926,6 +926,7 @@ declare module monaco.editor { ...@@ -926,6 +926,7 @@ declare module monaco.editor {
theme?: string; theme?: string;
mimeType?: string; mimeType?: string;
} }
export enum ScrollbarVisibility { export enum ScrollbarVisibility {
Auto = 1, Auto = 1,
Hidden = 2, Hidden = 2,
......
...@@ -19,7 +19,7 @@ import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel'; ...@@ -19,7 +19,7 @@ import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel'; import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
/** /**
* An implementation of editor for diffing binary files like images or videos. * An implementation of editor for diffing binary files like images or videos.
......
...@@ -15,7 +15,7 @@ import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel'; ...@@ -15,7 +15,7 @@ import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
import {DomScrollableElement} from 'vs/base/browser/ui/scrollbar/scrollableElement'; import {DomScrollableElement} from 'vs/base/browser/ui/scrollbar/scrollableElement';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
/* /*
* This class is only intended to be subclassed and not instantiated. * This class is only intended to be subclassed and not instantiated.
......
...@@ -33,7 +33,7 @@ import {IMenuService} from 'vs/platform/actions/common/actions'; ...@@ -33,7 +33,7 @@ import {IMenuService} from 'vs/platform/actions/common/actions';
import {TitleControl} from 'vs/workbench/browser/parts/editor/titleControl'; import {TitleControl} from 'vs/workbench/browser/parts/editor/titleControl';
import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {ScrollableElement} from 'vs/base/browser/ui/scrollbar/scrollableElement'; import {ScrollableElement} from 'vs/base/browser/ui/scrollbar/scrollableElement';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions'; import {ScrollbarVisibility} from 'vs/base/common/scrollable';
import {extractResources} from 'vs/base/browser/dnd'; import {extractResources} from 'vs/base/browser/dnd';
export class TabsTitleControl extends TitleControl { export class TabsTitleControl extends TitleControl {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册