Bismuth-Forge/bismuth
1
1
Fork 0
mirror of https://github.com/Bismuth-Forge/bismuth.git synced 2024-11-04 13:37:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(engine): ♻️ use aliases for some types

Browse Source
This commit is contained in:
Mikhail Zolotukhin 2021-10-19 00:59:42 +03:00
parent b18e2e3973
commit dd6b9d81ee
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/engine/index.ts
View File

@ -20,6 +20,8 @@ import { Log } from "../util/log";
import { WindowsLayout } from "./layout"; import { WindowsLayout } from "./layout";
export type Direction = "up" | "down" | "left" | "right"; export type Direction = "up" | "down" | "left" | "right";
export type CompassDirection = "east" | "west" | "south" | "north";
export type Step = -1 | 1;
export interface Engine { export interface Engine {
layouts: LayoutStore; layouts: LayoutStore;
@ -29,21 +31,9 @@ export interface Engine {
manage(window: EngineWindow): void; manage(window: EngineWindow): void;
unmanage(window: EngineWindow): void; unmanage(window: EngineWindow): void;
adjustLayout(basis: EngineWindow): void; adjustLayout(basis: EngineWindow): void;
resizeFloat( resizeFloat(window: EngineWindow, dir: CompassDirection, step: Step): void;
window: EngineWindow, resizeTile(basis: EngineWindow, dir: CompassDirection, step: Step): void;
dir: "east" | "west" | "south" | "north", resizeWindow(window: EngineWindow, dir: CompassDirection, step: Step): void;
step: -1 | 1
): void;
resizeTile(
basis: EngineWindow,
dir: "east" | "west" | "south" | "north",
step: -1 | 1
): void;
resizeWindow(
window: EngineWindow,
dir: "east" | "west" | "south" | "north",
step: -1 | 1
): void;
enforceSize(window: EngineWindow): void; enforceSize(window: EngineWindow): void;
currentLayoutOnCurrentSurface(): WindowsLayout; currentLayoutOnCurrentSurface(): WindowsLayout;
currentWindow(): EngineWindow | null; currentWindow(): EngineWindow | null;
@ -53,14 +43,14 @@ export interface Engine {
* @param step Direction to step in (1=forward, -1=backward) * @param step Direction to step in (1=forward, -1=backward)
* @param includeHidden Whether to step through (true) or skip over (false) minimized windows * @param includeHidden Whether to step through (true) or skip over (false) minimized windows
*/ */
focusOrder(step: -1 | 1, includeHidden: boolean): void; focusOrder(step: Step, includeHidden: boolean): void;
focusDir(dir: Direction): void; focusDir(dir: Direction): void;
swapOrder(window: EngineWindow, step: -1 | 1): void; swapOrder(window: EngineWindow, step: Step): void;
swapDirOrMoveFloat(dir: Direction): void; swapDirOrMoveFloat(dir: Direction): void;
setMaster(window: EngineWindow): void; setMaster(window: EngineWindow): void;
toggleFloat(window: EngineWindow): void; toggleFloat(window: EngineWindow): void;
floatAll(srf: DriverSurface): void; floatAll(srf: DriverSurface): void;
cycleLayout(step: 1 | -1): void; cycleLayout(step: Step): void;
setLayout(layoutClassID: string): void; setLayout(layoutClassID: string): void;
minimizeOthers(window: EngineWindow): void; minimizeOthers(window: EngineWindow): void;
isLayoutMonocleAndMinimizeRest(): boolean; isLayoutMonocleAndMinimizeRest(): boolean;
@ -113,8 +103,8 @@ export class EngineImpl implements Engine {
*/ */
public resizeFloat( public resizeFloat(
window: EngineWindow, window: EngineWindow,
dir: "east" | "west" | "south" | "north", dir: CompassDirection,
step: -1 | 1 step: Step
): void { ): void {
const srf = window.surface; const srf = window.surface;
@ -152,8 +142,8 @@ export class EngineImpl implements Engine {
*/ */
public resizeTile( public resizeTile(
basis: EngineWindow, basis: EngineWindow,
dir: "east" | "west" | "south" | "north", dir: CompassDirection,
step: -1 | 1 step: Step
): void { ): void {
const srf = basis.surface; const srf = basis.surface;
@ -219,8 +209,8 @@ export class EngineImpl implements Engine {
*/ */
public resizeWindow( public resizeWindow(
window: EngineWindow, window: EngineWindow,
dir: "east" | "west" | "south" | "north", dir: CompassDirection,
step: -1 | 1 step: Step
): void { ): void {
const state = window.state; const state = window.state;
if (EngineWindowImpl.isFloatingState(state)) { if (EngineWindowImpl.isFloatingState(state)) {
@ -352,7 +342,7 @@ export class EngineImpl implements Engine {
* @param step direction to step in (1 for forward, -1 for back) * @param step direction to step in (1 for forward, -1 for back)
* @param includeHidden whether to switch to or skip minimized windows * @param includeHidden whether to switch to or skip minimized windows
*/ */
public focusOrder(step: -1 | 1, includeHidden = false): void { public focusOrder(step: Step, includeHidden = false): void {
const window = this.controller.currentWindow; const window = this.controller.currentWindow;
let windows; let windows;
@ -412,7 +402,7 @@ export class EngineImpl implements Engine {
/** /**
* Swap the position of the current window with the next or previous window. * Swap the position of the current window with the next or previous window.
*/ */
public swapOrder(window: EngineWindow, step: -1 | 1): void { public swapOrder(window: EngineWindow, step: Step): void {
const srf = window.surface; const srf = window.surface;
const visibles = this.windows.getVisibleWindows(srf); const visibles = this.windows.getVisibleWindows(srf);
if (visibles.length < 2) { if (visibles.length < 2) {
@ -546,7 +536,7 @@ export class EngineImpl implements Engine {
/** /**
* Change the layout of the current surface to the next. * Change the layout of the current surface to the next.
*/ */
public cycleLayout(step: 1 | -1): void { public cycleLayout(step: Step): void {
const layout = this.layouts.cycleLayout( const layout = this.layouts.cycleLayout(
this.controller.currentSurface, this.controller.currentSurface,
step step