Restore window bounds on load instead of changing them later.

src/Command.ts

@@ -9,7 +9,7 @@ const executors: Dictionary<(i: Job, a: string[]) => void> = {
         let fullPath: string;
 
         if (!args.length) {
-            fullPath = homeDirectory();
+            fullPath = homeDirectory;
         } else {
             const enteredPath = args[0];
 

src/CommandExecutor.ts

@@ -64,7 +64,7 @@ class ShellExecutionStrategy extends CommandExecutionStrategy {
 
 class WindowsShellExecutionStrategy extends CommandExecutionStrategy {
     static async canExecute(job: Job) {
-        return isWindows();
+        return isWindows;
     }
 
     startExecution() {

src/Environment.ts

@@ -58,7 +58,7 @@ export default class Environment {
 
     get pwd(): string {
         if (!this.get("PWD")) {
-            this.pwd = homeDirectory();
+            this.pwd = homeDirectory;
         }
 
         return this.get("PWD");

src/Session.ts

@@ -8,19 +8,17 @@ import PluginManager from "./PluginManager";
 import {Status} from "./Enums";
 import ApplicationComponent from "./views/1_ApplicationComponent";
 import Environment from "./Environment";
-import {homeDirectory, normalizeDirectory, writeFileCreatingParents} from "./utils/Common";
+import {homeDirectory, normalizeDirectory, writeFileCreatingParents, stateFilePath} from "./utils/Common";
 import {remote} from "electron";
-import * as Path from "path";
 
 export default class Session extends EmitterWithUniqueID {
     jobs: Array<Job> = [];
     readonly environment = new Environment();
     history: typeof History;
     historicalCurrentDirectoriesStack: string[] = [];
-    private readonly stateFileName = Path.join(homeDirectory(), ".black-screen", "state");
     // The value of the dictionary is the default value used if there is no serialized data.
     private readonly serializableProperties: Dictionary<string> = {
-        directory: `String:${homeDirectory()}`,
+        directory: `String:${homeDirectory}`,
         history: `History:[]`,
     };
 
@@ -101,7 +99,7 @@ export default class Session extends EmitterWithUniqueID {
             values[key] = Serializer.serialize((<any>this)[key])
         );
 
-        writeFileCreatingParents(this.stateFileName, JSON.stringify(values)).then(
+        writeFileCreatingParents(stateFilePath, JSON.stringify(values)).then(
             () => void 0,
             (error: any) => { if (error) throw error; }
         );
@@ -123,7 +121,7 @@ export default class Session extends EmitterWithUniqueID {
 
     private readSerialized(): Dictionary<any> {
         try {
-            return JSON.parse(readFileSync(this.stateFileName).toString());
+            return JSON.parse(readFileSync(stateFilePath).toString());
         } catch (error) {
             return this.serializableProperties;
         }

src/main/Main.ts

@@ -1,5 +1,7 @@
 import {app, ipcMain, nativeImage, BrowserWindow, screen} from "electron";
 import menu from "./Menu";
+import {readFileSync} from "fs";
+import {windowBoundsFilePath} from "../utils/Common";
 
 
 let browserWindow: Electron.BrowserWindow = undefined;
@@ -16,7 +18,7 @@ app.on("mainWindow-all-closed", () => process.platform === "darwin" || app.quit(
 ipcMain.on("quit", app.quit);
 
 function getMainWindow(): Electron.BrowserWindow {
-    const workAreaSize = screen.getPrimaryDisplay().workAreaSize;
+    const bounds = windowBounds();
 
     if (!browserWindow) {
         let options: Electron.BrowserWindowOptions = {
@@ -28,8 +30,10 @@ function getMainWindow(): Electron.BrowserWindow {
             resizable: true,
             minWidth: 500,
             minHeight: 300,
-            width: workAreaSize.width,
-            height: workAreaSize.height,
+            width: bounds.width,
+            height: bounds.height,
+            x: bounds.x,
+            y: bounds.y,
             show: false,
         };
         browserWindow = new BrowserWindow(options);
@@ -48,3 +52,18 @@ function getMainWindow(): Electron.BrowserWindow {
 
     return browserWindow;
 }
+
+function windowBounds(): Electron.Bounds {
+    try {
+        return JSON.parse(readFileSync(windowBoundsFilePath).toString());
+    } catch (error) {
+        const workAreaSize = screen.getPrimaryDisplay().workAreaSize;
+
+        return {
+            width: workAreaSize.width,
+            height: workAreaSize.height,
+            x: 0,
+            y: 0,
+        };
+    }
+}

src/plugins/RVM.ts

@@ -3,7 +3,7 @@ import PluginManager from "../PluginManager";
 import * as Path from "path";
 import {homeDirectory, exists, readFile} from "../utils/Common";
 
-const rvmDirectory = Path.join(homeDirectory(), ".rvm");
+const rvmDirectory = Path.join(homeDirectory, ".rvm");
 const rubyVersionFileName = ".ruby-version";
 const gemSetNameFileName = ".ruby-gemset";
 

src/utils/Common.ts

@@ -172,20 +172,19 @@ export const {executablesInPaths} = new class {
     };
 };
 
-export function homeDirectory(): string {
-    return process.env[(isWindows()) ? "USERPROFILE" : "HOME"];
-}
+export const isWindows = process.platform === "win32";
+export const homeDirectory = process.env[(isWindows) ? "USERPROFILE" : "HOME"];
 
 export function resolveDirectory(pwd: string, directory: string): string {
     return normalizeDirectory(resolveFile(pwd, directory));
 }
 
 export function resolveFile(pwd: string, file: string): string {
-    return Path.resolve(pwd, file.replace(/^~/, homeDirectory()));
+    return Path.resolve(pwd, file.replace(/^~/, homeDirectory));
 }
 
 export function userFriendlyPath(path: string): string {
-    return path.replace(homeDirectory(), "~");
+    return path.replace(homeDirectory, "~");
 }
 
 export async function filterAsync<T>(values: T[], asyncPredicate: (t: T) => Promise<boolean>): Promise<T[]> {
@@ -215,10 +214,6 @@ function pluralFormOf(word: string) {
     }
 }
 
-export function isWindows(): boolean {
-    return process.platform === "win32";
-}
-
 export function groupWhen<T>(grouper: (a: T, b: T) => boolean, row: T[]): T[][] {
     if (row.length === 0) return [];
     if (row.length === 1) return [row];
@@ -390,3 +385,7 @@ export function mapObject<T, R>(object: Dictionary<T>, mapper: (key: string, val
 
     return result;
 }
+
+const baseConfigDirectory = Path.join(homeDirectory, ".black-screen");
+export const stateFilePath = Path.join(baseConfigDirectory, "state");
+export const windowBoundsFilePath = Path.join(baseConfigDirectory, "windowBounds");

src/views/1_ApplicationComponent.tsx

@@ -7,7 +7,7 @@ import {ipcRenderer} from "electron";
 import {KeyCode} from "../Enums";
 import {remote} from "electron";
 import * as css from "./css/main";
-import {restoreWindowBounds, saveWindowBounds} from "./ViewUtils";
+import {saveWindowBounds} from "./ViewUtils";
 
 interface State {
     sessions: Session[];
@@ -21,9 +21,6 @@ export default class ApplicationComponent extends React.Component<{}, State> {
         super(props);
         const focusedWindow = remote.BrowserWindow.getFocusedWindow();
 
-        restoreWindowBounds(focusedWindow);
-        setTimeout(() => this.recalculateDimensions(), 500);
-
         this.addTab();
         this.state = {sessions: this.activeTab.sessions};
 

src/views/ViewUtils.ts

@@ -1,5 +1,6 @@
 import {KeyCode} from "../Enums";
 import * as _ from "lodash";
+import {writeFileCreatingParents, windowBoundsFilePath} from "../utils/Common";
 
 export function stopBubblingUp(event: Event): Event {
     event.stopPropagation();
@@ -76,18 +77,9 @@ export function getCaretPosition(element: any): number {
     return caretOffset;
 }
 
-const windowBoundsKey = "windowBounds";
-
 export function saveWindowBounds(browserWindow: Electron.BrowserWindow) {
-    const bounds = browserWindow.getBounds();
-
-    localStorage.setItem(windowBoundsKey, JSON.stringify(bounds));
-}
-
-export function restoreWindowBounds(browserWindow: Electron.BrowserWindow) {
-    const windowBounds: Electron.Rectangle = JSON.parse(localStorage.getItem(windowBoundsKey));
-
-    if (windowBounds) {
-        browserWindow.setBounds(windowBounds, false);
-    }
+    writeFileCreatingParents(windowBoundsFilePath, JSON.stringify(browserWindow.getBounds())).then(
+        () => void 0,
+        (error: any) => { if (error) throw error; }
+    );
 }