hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Tweak name of the splash window for loading to avoid confusion with similarly named phenomenon

Browse Source 
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-05-05 10:16:21 +03:00
parent 37e600cba9
commit 8f27110930
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/start-main-application/lens-window/show-application-window.injectable.ts
View File

@ -3,8 +3,7 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationIsLoadingWindowInjectable
from "./application-is-loading-window/application-is-loading-window.injectable";
import splashWindowInjectable from "./splash-window/splash-window.injectable";
import applicationWindowInjectable from "./application-window/application-window.injectable";
const showApplicationWindowInjectable = getInjectable({
@ -13,8 +12,8 @@ const showApplicationWindowInjectable = getInjectable({
instantiate: (di) => {
const applicationWindow = di.inject(applicationWindowInjectable);
const applicationIsLoadingWindow = di.inject(
applicationIsLoadingWindowInjectable,
const splashWindow = di.inject(
splashWindowInjectable,
);
return async () => {
@ -22,11 +21,11 @@ const showApplicationWindowInjectable = getInjectable({
return;
}
await applicationIsLoadingWindow.show();
await splashWindow.show();
await applicationWindow.show();
applicationIsLoadingWindow.close();
splashWindow.close();
};
},
});

6
src/main/start-main-application/lens-window/application-is-loading-window/application-is-loading-window.injectable.ts → src/main/start-main-application/lens-window/splash-window/splash-window.injectable.ts
View File

@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable";
import { lensWindowInjectionToken } from "../application-window/lens-window-injection-token";
import createLensWindowInjectable from "../application-window/create-lens-window.injectable";
const applicationIsLoadingWindowInjectable = getInjectable({
id: "application-is-loading-window",
const splashWindowInjectable = getInjectable({
id: "splash-window",
instantiate: (di) => {
const createLensWindow = di.inject(createLensWindowInjectable);
@ -27,4 +27,4 @@ const applicationIsLoadingWindowInjectable = getInjectable({
injectionToken: lensWindowInjectionToken,
});
export default applicationIsLoadingWindowInjectable;
export default splashWindowInjectable;

8
src/main/start-main-application/start-main-application.injectable.ts
View File

@ -10,7 +10,7 @@ import { beforeElectronIsReadyInjectionToken } from "./runnable-tokens/before-el
import { beforeApplicationIsLoadingInjectionToken } from "./runnable-tokens/before-application-is-loading-injection-token";
import { onLoadOfApplicationInjectionToken } from "./runnable-tokens/on-load-of-application-injection-token";
import { afterApplicationIsLoadedInjectionToken } from "./runnable-tokens/after-application-is-loaded-injection-token";
import applicationIsLoadingWindowInjectable from "./lens-window/application-is-loading-window/application-is-loading-window.injectable";
import splashWindowInjectable from "./lens-window/splash-window/splash-window.injectable";
import applicationWindowInjectable from "./lens-window/application-window/application-window.injectable";
import shouldStartHiddenInjectable from "../electron-app/features/should-start-hidden.injectable";
@ -28,7 +28,7 @@ const startMainApplicationInjectable = getInjectable({
const runManySync = runManySyncFor(di);
const waitForElectronToBeReady = di.inject(waitForElectronToBeReadyInjectable);
const applicationWindow = di.inject(applicationWindowInjectable);
const applicationIsLoadingWindow = di.inject(applicationIsLoadingWindowInjectable);
const splashWindow = di.inject(splashWindowInjectable);
const shouldStartHidden = di.inject(shouldStartHiddenInjectable);
const openDeepLink = di.inject(openDeepLinkInjectable);
const commandLineArguments = di.inject(commandLineArgumentsInjectable);
@ -48,7 +48,7 @@ const startMainApplicationInjectable = getInjectable({
await beforeApplicationIsLoading();
if (!shouldStartHidden) {
await applicationIsLoadingWindow.show();
await splashWindow.show();
}
await onLoadOfApplication();
@ -62,7 +62,7 @@ const startMainApplicationInjectable = getInjectable({
await applicationWindow.show();
}
applicationIsLoadingWindow.close();
splashWindow.close();
}
await afterApplicationIsLoaded();