From 3d0964bd85bc23eafd43f95af29be6f3518149fe Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov Date: Sun, 17 Dec 2017 18:48:21 +0300 Subject: [PATCH] [atom] Use interface for pixel position type --- types/atom/atom-tests.ts | 2 +- types/atom/index.d.ts | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts index e43b592272..6001f621f7 100644 --- a/types/atom/atom-tests.ts +++ b/types/atom/atom-tests.ts @@ -14,7 +14,6 @@ declare let elements: HTMLElement[]; declare const div: HTMLDivElement; declare const event: KeyboardEvent; declare const mouseEvent: MouseEvent; -declare let pixelPos: {left: number, top: number}; declare let buffer: Atom.TextBuffer; declare const color: Atom.Color; @@ -67,6 +66,7 @@ declare let subscription: Atom.Disposable; declare let subscriptions: Atom.CompositeDisposable; declare let tooltips: Atom.Tooltip[]; declare let workspaceCenter: Atom.WorkspaceCenter; +declare let pixelPos: Atom.PixelPosition; declare let textEditorElement: Atom.TextEditorElement; declare let textEditorComponent: Atom.TextEditorComponent; diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts index cf997bf5a6..6bf1bc6fd0 100644 --- a/types/atom/index.d.ts +++ b/types/atom/index.d.ts @@ -2401,16 +2401,21 @@ export class TextEditor { setPlaceholderText(placeholderText: string): void; } +export interface PixelPosition { + left: number; + top: number; +} + /** * Undocumented: Rendering component for TextEditor */ export interface TextEditorComponent { /** Does not clip screenPosition, unlike similar method on TextEditorElement */ - pixelPositionForScreenPosition(screenPosition: PointLike): {left: number, top: number}; - screenPositionForPixelPosition(pos: {top: number, left: number}): Point; + pixelPositionForScreenPosition(screenPosition: PointLike): PixelPosition; + screenPositionForPixelPosition(pos: PixelPosition): Point; pixelPositionForMouseEvent(event: { clientX: number, clientY: number - }): {top: number, left: number}; + }): PixelPosition; screenPositionForMouseEvent(event: {clientX: number, clientY: number}): Point; } @@ -2444,10 +2449,10 @@ export interface TextEditorElement extends HTMLElement { getScrollHeight(): number; /** Extended: Converts a buffer position to a pixel position. */ - pixelPositionForBufferPosition(bufferPosition: PointLike): {left: number, top: number}; + pixelPositionForBufferPosition(bufferPosition: PointLike): PixelPosition; /** Extended: Converts a screen position to a pixel position. */ - pixelPositionForScreenPosition(screenPosition: PointLike): {left: number, top: number}; + pixelPositionForScreenPosition(screenPosition: PointLike): PixelPosition; // Event subscription onDidChangeScrollTop(callback: (scrollTop: number) => void): Disposable;