simplify isEnabled into enabled property

This commit is contained in:
Eon S. Jeon 2019-02-11 03:13:21 +09:00
parent 1129b6a6e6
commit 1101284321
7 changed files with 28 additions and 28 deletions

View File

@ -19,14 +19,14 @@
// DEALINGS IN THE SOFTWARE.
interface ILayout {
/* read-only */
readonly enabled: boolean;
/* methods */
adjust?(area: Rect, tiles: Tile[], basis: Tile): void;
apply(tiles: Tile[], area: Rect, workingArea?: Rect): void;
handleUserInput?(input: UserInput, data?: any): boolean;
/* if true, layout completely overrides the default behavior */
isEnabled(): boolean;
toString(): string;
/* overriding */
handleUserInput?(input: UserInput, data?: any): boolean;
}

View File

@ -19,6 +19,10 @@
// DEALINGS IN THE SOFTWARE.
class MonocleLayout implements ILayout {
public get enabled(): boolean {
return Config.enableMonocleLayout;
}
public apply = (tiles: Tile[], area: Rect, workingArea?: Rect): void => {
if (Config.monocleMaximize) {
area = workingArea || area;
@ -27,10 +31,6 @@ class MonocleLayout implements ILayout {
tiles.forEach((tile) => (tile.geometry = area));
}
public isEnabled(): boolean {
return Config.enableMonocleLayout;
}
public toString(): string {
return "MonocleLayout()";
}

View File

@ -21,6 +21,10 @@
class QuarterLayout implements ILayout {
public static readonly MaxProportion = 0.8;
public get enabled(): boolean {
return Config.enableQuarterLayout;
}
private lhsplit: number;
private rhsplit: number;
private vsplit: number;
@ -114,10 +118,6 @@ class QuarterLayout implements ILayout {
});
}
public isEnabled(): boolean {
return Config.enableQuarterLayout;
}
public toString(): string {
return "QuarterLayout()";
}

View File

@ -19,6 +19,10 @@
// DEALINGS IN THE SOFTWARE.
class SpreadLayout implements ILayout {
public get enabled(): boolean {
return Config.enableSpreadLayout;
}
private space: number; /* in ratio */
constructor() {
@ -62,10 +66,6 @@ class SpreadLayout implements ILayout {
return true;
}
public isEnabled(): boolean {
return Config.enableSpreadLayout;
}
public toString(): string {
return "SpreadLayout(" + this.space + ")";
}

View File

@ -19,6 +19,10 @@
// DEALINGS IN THE SOFTWARE.
class StairLayout implements ILayout {
public get enabled(): boolean {
return Config.enableStairLayout;
}
private space: number; /* in PIXELS */
constructor() {
@ -59,10 +63,6 @@ class StairLayout implements ILayout {
return true;
}
public isEnabled(): boolean {
return Config.enableStairLayout;
}
public toString(): string {
return "StairLayout(" + this.space + ")";
}

View File

@ -40,6 +40,10 @@ class TileLayout implements ILayout {
public static readonly MinMasterRatio = 0.2;
public static readonly MaxMasterRatio = 0.8;
public get enabled(): boolean {
return Config.enableTileLayout;
}
private numMaster: number;
private masterRatio: number; /* in ratio */
@ -128,10 +132,6 @@ class TileLayout implements ILayout {
return true;
}
public isEnabled(): boolean {
return Config.enableTileLayout;
}
public toString(): string {
return "TileLayout(nmaster=" + this.numMaster + ", ratio=" + this.masterRatio + ")";
}

View File

@ -51,7 +51,7 @@ class LayoutStore {
entry.push(layout);
if (entry[0].isEnabled())
if (entry[0].enabled)
break;
}
}