From ec5ef1db5663069fe1d222cadc4decb73195a1f0 Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Fri, 18 Feb 2022 16:22:24 +0000 Subject: [PATCH 1/2] dynamic window sizing --- nym-wallet/src/index.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nym-wallet/src/index.tsx b/nym-wallet/src/index.tsx index 90490cda9f..a24082305c 100644 --- a/nym-wallet/src/index.tsx +++ b/nym-wallet/src/index.tsx @@ -1,5 +1,6 @@ -import React, { useContext } from 'react' +import React, { useContext, useEffect, useLayoutEffect } from 'react' import ReactDOM from 'react-dom' +import { appWindow, LogicalSize } from '@tauri-apps/api/window' import { ErrorBoundary } from 'react-error-boundary' import { BrowserRouter as Router } from 'react-router-dom' import { Routes } from './routes' @@ -12,6 +13,14 @@ import { Settings } from './pages' const App = () => { const { clientDetails } = useContext(ClientContext) + const setWindowSize = async () => { + await appWindow.setSize(new LogicalSize(screen.width, screen.height)) + } + + useLayoutEffect(() => { + setWindowSize() + }, []) + return !clientDetails ? ( From 7941b7099fb18a030dc8d26d553b76ca9c765960 Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Thu, 24 Feb 2022 09:51:38 +0000 Subject: [PATCH 2/2] use window maximize --- nym-wallet/src/index.tsx | 7 ++----- nym-wallet/src/utils/index.ts | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nym-wallet/src/index.tsx b/nym-wallet/src/index.tsx index a24082305c..533a133401 100644 --- a/nym-wallet/src/index.tsx +++ b/nym-wallet/src/index.tsx @@ -1,6 +1,5 @@ import React, { useContext, useEffect, useLayoutEffect } from 'react' import ReactDOM from 'react-dom' -import { appWindow, LogicalSize } from '@tauri-apps/api/window' import { ErrorBoundary } from 'react-error-boundary' import { BrowserRouter as Router } from 'react-router-dom' import { Routes } from './routes' @@ -10,15 +9,13 @@ import { Admin, Welcome } from './pages' import { ErrorFallback } from './components' import { NymWalletTheme, WelcomeTheme } from './theme' import { Settings } from './pages' +import { maximizeWindow } from './utils' const App = () => { const { clientDetails } = useContext(ClientContext) - const setWindowSize = async () => { - await appWindow.setSize(new LogicalSize(screen.width, screen.height)) - } useLayoutEffect(() => { - setWindowSize() + maximizeWindow() }, []) return !clientDetails ? ( diff --git a/nym-wallet/src/utils/index.ts b/nym-wallet/src/utils/index.ts index 16b35b6860..c0df0b8d64 100644 --- a/nym-wallet/src/utils/index.ts +++ b/nym-wallet/src/utils/index.ts @@ -1,4 +1,5 @@ import { invoke } from '@tauri-apps/api' +import { appWindow } from '@tauri-apps/api/window' import bs58 from 'bs58' import { minor, valid } from 'semver' import { userBalance, majorToMinor, getGasFee } from '../requests' @@ -124,3 +125,7 @@ export const currencyMap = (network: Network) => { return currency } + +export const maximizeWindow = async () => { + await appWindow.maximize() +}