Merge pull request #3151 from RedisInsight/feature/RI-5051

#RI-5051 - restore window size and position

Author: mariasergeenko

redisinsight/desktop/src/lib/window/browserWindow.ts

@@ -1,11 +1,12 @@
 import contextMenu from 'electron-context-menu'
-import { BrowserWindow } from 'electron'
+import { BrowserWindow, Rectangle } from 'electron'
 import { v4 as uuidv4 } from 'uuid'
 
 import { IParsedDeepLink } from 'desktopSrc/lib/app/deep-link.handlers'
 import { configMain as config } from 'desktopSrc/config'
-import { updateTray } from 'desktopSrc/lib'
-import { resolveHtmlPath } from 'desktopSrc/utils'
+import { electronStore, updateTray } from 'desktopSrc/lib'
+import { resolveHtmlPath, getFittedBounds } from 'desktopSrc/utils'
+import { ElectronStorageItem } from 'uiSrc/electron/constants'
 import { initWindowHandlers } from './window.handlers'
 
 export const windows = new Map<string, BrowserWindow>()
@@ -14,6 +15,7 @@ export const focusWindow = (win: BrowserWindow) => {
   if (win.isMinimized()) win.restore()
   win.focus()
 }
+export const NEW_WINDOW_OFFSET = 24
 
 export enum WindowType {
   Splash = 'splash',
@@ -37,17 +39,26 @@ export const createWindow = async ({
 }: ICreateWindow) => {
   let x
   let y
+  let { width, height } = options
+
   const currentWindow = BrowserWindow.getFocusedWindow()
+  const isNewMainWindow = currentWindow && currentWindow?.getTitle() !== config.splashWindow.title
 
-  if (currentWindow && currentWindow?.getTitle() !== config.splashWindow.title) {
+  if (isNewMainWindow) {
     const [currentWindowX, currentWindowY] = currentWindow.getPosition()
-    x = currentWindowX + 24
-    y = currentWindowY + 24
+    const [currentWindowWidth, currentWindowHeight] = currentWindow?.getSize()
+    x = currentWindowX + NEW_WINDOW_OFFSET
+    y = currentWindowY + NEW_WINDOW_OFFSET
+    width = currentWindowWidth
+    height = currentWindowHeight
   }
+
   const newWindow: BrowserWindow | null = new BrowserWindow({
     ...options,
     x,
     y,
+    width,
+    height,
     webPreferences: {
       ...options.webPreferences,
       preload: options.preloadPath
@@ -59,6 +70,14 @@ export const createWindow = async ({
     return newWindow
   }
 
+  const savedBounds = electronStore?.get(ElectronStorageItem.bounds)
+  if (!isNewMainWindow && savedBounds) {
+    const bounds = getFittedBounds(savedBounds as Rectangle)
+    if (bounds) {
+      newWindow.setBounds(bounds)
+    }
+  }
+
   newWindow.loadURL(resolveHtmlPath(htmlFileName, options?.parsedDeepLink))
 
   initWindowHandlers(newWindow, prevWindow, windows, id)

redisinsight/desktop/src/lib/window/window.handlers.ts

@@ -55,6 +55,8 @@ export const initWindowHandlers = (
   })
 
   newWindow.on('close', (event) => {
+    electronStore?.set(ElectronStorageItem.bounds, newWindow.getNormalBounds())
+
     if (!getIsQuiting() && getDisplayAppInTrayValue() && windows.size === 1) {
       event.preventDefault()
       newWindow?.hide()

redisinsight/desktop/src/utils/index.ts

@@ -2,3 +2,4 @@ export * from './resolveHtmlPath'
 export * from './wrapErrorSensitiveData'
 export * from './getAssetPath'
 export * from './showOrCreateWindow'
+export * from './window-size'

redisinsight/desktop/src/utils/window-size.ts

@@ -0,0 +1,31 @@
+import { Rectangle, screen } from 'electron'
+
+export const getFittedBounds = (bounds: Rectangle): Rectangle | null => {
+  try {
+    const options: any = {}
+    const area = screen.getDisplayMatching(bounds).workArea
+
+    if (
+      bounds.x >= area.x
+      && bounds.y >= area.y
+      && bounds.x + bounds.width <= area.x + area.width
+      && bounds.y + bounds.height <= area.y + area.height
+    ) {
+      options.x = bounds.x
+      options.y = bounds.y
+    } else return null
+
+    // If the saved size is still valid, use it.
+    if (bounds.width <= area.width) {
+      options.width = bounds.width
+    } else return null
+
+    if (bounds.height <= area.height) {
+      options.height = bounds.height
+    } else return null
+
+    return options as Rectangle
+  } catch {
+    return null
+  }
+}

redisinsight/ui/src/electron/constants/storageElectron.ts

@@ -7,6 +7,7 @@ enum ElectronStorageItem {
   updatePreviousVersion = 'updatePreviousVersion',
   zoomFactor = 'zoomFactor',
   themeSource = 'themeSource',
+  bounds = 'bounds'
 }
 
 export default ElectronStorageItem