Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-09 09:42:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1056 from TriliumNext/chore_port-desktop-mobile-entrypoints

Browse Source 
chore: port desktop and mobile entrypoints
This commit is contained in:
Elian Doran 2025-01-28 13:10:46 +02:00 committed by GitHub
commit 55ce673f1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/public/app/desktop.js → src/public/app/desktop.ts
View File

@ -9,6 +9,8 @@ import electronContextMenu from "./menus/electron_context_menu.js";
import glob from "./services/glob.js"; import glob from "./services/glob.js";
import { t } from "./services/i18n.js"; import { t } from "./services/i18n.js";
import options from "./services/options.js"; import options from "./services/options.js";
import type ElectronRemote from "@electron/remote";
import type Electron from "electron";
await appContext.earlyInit(); await appContext.earlyInit();
@ -44,10 +46,9 @@ if (utils.isElectron()) {
} }
function initOnElectron() { function initOnElectron() {
const electron = utils.dynamicRequire("electron"); const electron: typeof Electron = utils.dynamicRequire("electron");
electron.ipcRenderer.on("globalShortcut", async (event, actionName) => appContext.triggerCommand(actionName)); electron.ipcRenderer.on("globalShortcut", async (event, actionName) => appContext.triggerCommand(actionName));
const electronRemote: typeof ElectronRemote = utils.dynamicRequire("@electron/remote");
const electronRemote = utils.dynamicRequire("@electron/remote");
const currentWindow = electronRemote.getCurrentWindow(); const currentWindow = electronRemote.getCurrentWindow();
const style = window.getComputedStyle(document.body); const style = window.getComputedStyle(document.body);
@ -58,7 +59,7 @@ function initOnElectron() {
} }
} }
function initTitleBarButtons(style, currentWindow) { function initTitleBarButtons(style: CSSStyleDeclaration, currentWindow: Electron.BrowserWindow) {
if (window.glob.platform === "win32") { if (window.glob.platform === "win32") {
const applyWindowsOverlay = () => { const applyWindowsOverlay = () => {
const color = style.getPropertyValue("--native-titlebar-background"); const color = style.getPropertyValue("--native-titlebar-background");
@ -81,9 +82,14 @@ function initTitleBarButtons(style, currentWindow) {
} }
} }
function initTransparencyEffects(style, currentWindow) { function initTransparencyEffects(style: CSSStyleDeclaration, currentWindow: Electron.BrowserWindow) {
if (window.glob.platform === "win32") { if (window.glob.platform === "win32") {
const material = style.getPropertyValue("--background-material"); const material = style.getPropertyValue("--background-material");
currentWindow.setBackgroundMaterial(material); // TriliumNextTODO: find a nicer way to make TypeScript happy – unfortunately TS did not like Array.includes here
const bgMaterialOptions = ["auto", "none", "mica", "acrylic", "tabbed"] as const;
const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
if (foundBgMaterialOption) {
currentWindow.setBackgroundMaterial(foundBgMaterialOption);
}
} }
} }

0
src/public/app/mobile.js → src/public/app/mobile.ts
View File

1
src/public/app/types.d.ts vendored
View File

@ -43,6 +43,7 @@ interface CustomGlobals {
appCssNoteIds: string[]; appCssNoteIds: string[];
triliumVersion: string; triliumVersion: string;
TRILIUM_SAFE_MODE: boolean; TRILIUM_SAFE_MODE: boolean;
platform?: typeof process.platform;
} }
type RequireMethod = (moduleName: string) => any; type RequireMethod = (moduleName: string) => any;