summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-11-19 11:45:59 +0100
committerOskar Nyberg <oskar@mullvad.net>2020-11-19 11:45:59 +0100
commita51e006ddfcc9a49ad4a4bf448a58bf2d4f5bf6a (patch)
treed0f03acb035e87e1bc4f415878b9bb8d482c9157 /gui/src/shared
parentb72f29cd885c2e9c02b27f72cd93683aba253e8d (diff)
parent9f9eb140f0f7eab42bae361be6202418c59475f5 (diff)
downloadmullvadvpn-a51e006ddfcc9a49ad4a4bf448a58bf2d4f5bf6a.tar.xz
mullvadvpn-a51e006ddfcc9a49ad4a4bf448a58bf2d4f5bf6a.zip
Merge branch 'add-app-window-setting'
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/gui-settings-state.ts3
-rw-r--r--gui/src/shared/ipc-event-channel.ts5
2 files changed, 8 insertions, 0 deletions
diff --git a/gui/src/shared/gui-settings-state.ts b/gui/src/shared/gui-settings-state.ts
index 043892f833..d8fc1f1ee2 100644
--- a/gui/src/shared/gui-settings-state.ts
+++ b/gui/src/shared/gui-settings-state.ts
@@ -20,4 +20,7 @@ export interface IGuiSettingsState {
// Tells the app to hide the main window on start.
startMinimized: boolean;
+
+ // Tells the app wheter or not it should act as a window or a context menu.
+ unpinnedWindow: boolean;
}
diff --git a/gui/src/shared/ipc-event-channel.ts b/gui/src/shared/ipc-event-channel.ts
index a7410dd22c..587397467c 100644
--- a/gui/src/shared/ipc-event-channel.ts
+++ b/gui/src/shared/ipc-event-channel.ts
@@ -101,6 +101,7 @@ interface IGuiSettingsMethods extends IReceiver<IGuiSettingsState> {
setStartMinimized(startMinimized: boolean): void;
setMonochromaticIcon(monochromaticIcon: boolean): void;
setPreferredLocale(locale: string): void;
+ setUnpinnedWindow(unpinnedWindow: boolean): void;
}
interface IGuiSettingsHandlers extends ISender<IGuiSettingsState> {
@@ -109,6 +110,7 @@ interface IGuiSettingsHandlers extends ISender<IGuiSettingsState> {
handleStartMinimized(fn: (startMinimized: boolean) => void): void;
handleMonochromaticIcon(fn: (monochromaticIcon: boolean) => void): void;
handleSetPreferredLocale(fn: (locale: string) => void): void;
+ handleSetUnpinnedWindow(fn: (unpinnedWindow: boolean) => void): void;
}
interface IAccountHandlers extends ISender<IAccountData | undefined> {
@@ -204,6 +206,7 @@ const SET_AUTO_CONNECT = 'set-auto-connect';
const SET_MONOCHROMATIC_ICON = 'set-monochromatic-icon';
const SET_START_MINIMIZED = 'set-start-minimized';
const SET_PREFERRED_LOCALE = 'set-preferred-locale';
+const SET_UNPINNED_WINDOW = 'set-unpinned-window';
const GET_APP_STATE = 'get-app-state';
@@ -305,6 +308,7 @@ export class IpcRendererEventChannel {
setMonochromaticIcon: set(SET_MONOCHROMATIC_ICON),
setStartMinimized: set(SET_START_MINIMIZED),
setPreferredLocale: set(SET_PREFERRED_LOCALE),
+ setUnpinnedWindow: set(SET_UNPINNED_WINDOW),
};
public static autoStart: IAutoStartMethods = {
@@ -412,6 +416,7 @@ export class IpcMainEventChannel {
handleMonochromaticIcon: handler(SET_MONOCHROMATIC_ICON),
handleStartMinimized: handler(SET_START_MINIMIZED),
handleSetPreferredLocale: handler(SET_PREFERRED_LOCALE),
+ handleSetUnpinnedWindow: handler(SET_UNPINNED_WINDOW),
};
public static autoStart: IAutoStartHandlers = {