diff --git a/src/services/keyboard_actions.ts b/src/services/keyboard_actions.ts index aca668568..e17e4dc21 100644 --- a/src/services/keyboard_actions.ts +++ b/src/services/keyboard_actions.ts @@ -2,11 +2,10 @@ import optionService from "./options.js"; import log from "./log.js"; -import { isElectron as getIsElectron, isMac as getIsMac } from "./utils.js"; +import { isElectron as getIsElectron, isMac } from "./utils.js"; import type { KeyboardShortcut } from "./keyboard_actions_interface.js"; import { t } from "i18next"; -const isMac = getIsMac(); const isElectron = getIsElectron(); function getDefaultKeyboardActions() { diff --git a/src/services/log.ts b/src/services/log.ts index fe877dbcc..66131f155 100644 --- a/src/services/log.ts +++ b/src/services/log.ts @@ -17,7 +17,7 @@ const MINUTE = 60 * SECOND; const HOUR = 60 * MINUTE; const DAY = 24 * HOUR; -const NEW_LINE = isWindows() ? "\r\n" : "\n"; +const NEW_LINE = isWindows ? "\r\n" : "\n"; let todaysMidnight!: Date; diff --git a/src/services/options_init.ts b/src/services/options_init.ts index 26f2d943f..dedd1a896 100644 --- a/src/services/options_init.ts +++ b/src/services/options_init.ts @@ -77,7 +77,7 @@ const defaultOptions: DefaultOption[] = [ { name: "revisionSnapshotTimeInterval", value: "600", isSynced: true }, { name: "revisionSnapshotNumberLimit", value: "-1", isSynced: true }, { name: "protectedSessionTimeout", value: "600", isSynced: true }, - { name: "zoomFactor", value: isWindows() ? "0.9" : "1.0", isSynced: false }, + { name: "zoomFactor", value: isWindows ? "0.9" : "1.0", isSynced: false }, { name: "overrideThemeFonts", value: "false", isSynced: false }, { name: "mainFontFamily", value: "theme", isSynced: false }, { name: "mainFontSize", value: "100", isSynced: false }, diff --git a/src/services/utils.ts b/src/services/utils.ts index 9b05e2199..4140d2c9d 100644 --- a/src/services/utils.ts +++ b/src/services/utils.ts @@ -321,11 +321,9 @@ export function getResourceDir() { } } -export function isMac() { - return process.platform === "darwin"; -} +export const isMac = process.platform === "darwin"; -export function isWindows() { +export const isWindows = process.platform === "win32"; return process.platform === "win32"; } diff --git a/src/services/window.ts b/src/services/window.ts index c9307cba9..70107285c 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -116,10 +116,10 @@ function getWindowExtraOpts() { const extraOpts: Partial = {}; if (!optionService.getOptionBool("nativeTitleBarVisible")) { - if (isMac()) { + if (isMac) { extraOpts.titleBarStyle = "hiddenInset"; extraOpts.titleBarOverlay = true; - } else if (isWindows()) { + } else if (isWindows) { extraOpts.titleBarStyle = "hidden"; extraOpts.titleBarOverlay = true; } else { @@ -129,7 +129,7 @@ function getWindowExtraOpts() { } // Window effects (Mica) - if (optionService.getOptionBool("backgroundEffects") && isWindows()) { + if (optionService.getOptionBool("backgroundEffects") && isWindows) { extraOpts.backgroundMaterial = "auto"; }