every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bugfix] Fix window geometry bug that was not save and restore. changes the way how to get appWindow instance from Tauri.

Browse Source
This commit is contained in:
Sakamoto Shiina
2025-05-11 15:26:05 +09:00
parent 61e333401f
commit b2bc1e62cb
10 changed files with 53 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-ui/app/_app_controllers/CornerRadiusController.jsx
View File

@@ -1,10 +1,12 @@
import { useState, useEffect } from "react";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { store } from "@store";
export const CornerRadiusController = () => {
const [is_win11, setIsWin11] = useState(false);
const [is_maximized, setIsMaximized] = useState(false);
const appWindow = store.appWindow;
// OS 判定（Win11 なら platformVersion の major ≥13）
useEffect(() => {
if (navigator.userAgentData?.getHighEntropyValues) {
@@ -27,12 +29,11 @@ export const CornerRadiusController = () => {
useEffect(() => {
let unlisten;
const setup = async () => {
const window = await getCurrentWindow();
// 初期状態取得
setIsMaximized(await window.isMaximized());
setIsMaximized(await appWindow.isMaximized());
// リサイズ時にも再取得
const updateMax = () => window.isMaximized().then(setIsMaximized);
unlisten = await window.listen("tauri://resize", updateMax);
const updateMax = () => appWindow.isMaximized().then(setIsMaximized);
unlisten = await appWindow.listen("tauri://resize", updateMax);
}
setup();

12
src-ui/app/error_boundary/AppErrorBoundary.jsx
View File

@@ -1,5 +1,4 @@
import { useState } from "react";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { ErrorBoundary } from "react-error-boundary";
import XMarkSvg from "@images/cancel.svg?react";
import CopySvg from "@images/copy.svg?react";
@@ -7,6 +6,8 @@ import CheckMarkSvg from "@images/check_mark.svg?react";
import { ContactsContainer } from "./contacts_container/ContactsContainer";
import { useWindow } from "@logics_common";
import styles from "./AppErrorBoundary.module.scss";
export const AppErrorBoundary = ({children}) => {
@@ -65,14 +66,9 @@ const ErrorContainer = ({error}) => {
};
const CloseButtonContainer = () => {
const asyncClose = async () => {
const appWindow = await getCurrentWindow();
appWindow.close();
};
const { asyncCloseApp } = useWindow();
return (
<button className={styles.close_button_wrapper} onClick={asyncClose}>
<button className={styles.close_button_wrapper} onClick={asyncCloseApp}>
<div className={styles.close_button}>
<XMarkSvg className={styles.x_mark_svg}/>
</div>

4
src-ui/app/index.jsx
View File

@@ -2,6 +2,10 @@ import React from "react";
import ReactDOM from "react-dom/client";
import "@root/locales/config.js";
import "./_index_css/root.css";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { store } from "@store";
store.appWindow = await getCurrentWindow();
import { App } from "./App";

3
src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx
View File

@@ -5,7 +5,6 @@ import { useMessage } from "@logics_common";
import { useSendMessageButtonType, useEnableAutoClearMessageInputBox } from "@logics_configs";
import { useMessageLogScroll } from "@logics_main";
import { store } from "@store";
import { getCurrentWindow } from "@tauri-apps/api/window";
export const MessageInputBox = () => {
const [message_history, setMessageHistory] = useState([]);
@@ -41,8 +40,6 @@ export const MessageInputBox = () => {
const onSubmitFunction = (e) => {
e.preventDefault();
// const appWindow = getCurrentWindow();
// appWindow.minimize();
if (!currentMessageInputValue.data.trim()) return updateMessageInputValue("");

9
src-ui/app/splash_component/SplashComponent.jsx
View File

@@ -4,7 +4,7 @@ import { StartUpProgressContainer } from "./start_up_progress_container/StartUpP
import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer/";
import MegaphoneSvg from "@images/megaphone.svg?react";
import XMarkSvg from "@images/cancel.svg?react";
import { getCurrentWindow } from "@tauri-apps/api/window";
import { useWindow } from "@logics_common";
import clsx from "clsx";
export const SplashComponent = () => {
@@ -73,13 +73,10 @@ const AnnouncementsContainer = () => {
const CloseButtonContainer = () => {
const asyncClose = async () => {
const appWindow = await getCurrentWindow();
appWindow.close();
};
const { asyncCloseApp } = useWindow();
return (
<button className={styles.close_button_wrapper} onClick={asyncClose}>
<button className={styles.close_button_wrapper} onClick={asyncCloseApp}>
<div className={styles.close_button}>
<XMarkSvg className={styles.x_mark_svg}/>
</div>

30
src-ui/app/window_title_bar/WindowTitleBar.jsx
View File

@@ -1,3 +1,4 @@
import { useWindow } from "@logics_common";
// import clsx from "clsx";
import styles from "./WindowTitleBar.module.scss";
import XMarkSvg from "@images/cancel.svg?react";
@@ -5,29 +6,8 @@ import SquareSvg from "@images/square.svg?react";
import LineSvg from "@images/line.svg?react";
import VrctSvg from "@images/vrct.svg?react";
import { getCurrentWindow } from "@tauri-apps/api/window";
export const WindowTitleBar = () => {
const asyncMinimize = async () => {
const appWindow = await getCurrentWindow();
appWindow.minimize();
};
const asyncMaximize = async () => {
const appWindow = await getCurrentWindow();
const maximizeState = await appWindow.isMaximized();
if (!maximizeState) {
appWindow.maximize();
} else {
appWindow.unmaximize();
}
};
const asyncClose = async () => {
const appWindow = await getCurrentWindow();
appWindow.close();
};
const { asyncCloseApp, asyncToggleMaximizeApp, asyncMinimizeApp} = useWindow();
return (
<div className={styles.container}>
@@ -37,13 +17,13 @@ export const WindowTitleBar = () => {
</div>
<div className={styles.window_control_wrapper}>
<div className={styles.minimize_button} onClick={asyncMinimize}>
<div className={styles.minimize_button} onClick={asyncMinimizeApp}>
<LineSvg className={styles.line_svg}/>
</div>
<div className={styles.maximize_button} onClick={asyncMaximize}>
<div className={styles.maximize_button} onClick={asyncToggleMaximizeApp}>
<SquareSvg className={styles.square_svg}/>
</div>
<div className={styles.close_button} onClick={asyncClose}>
<div className={styles.close_button} onClick={asyncCloseApp}>
<XMarkSvg className={styles.x_mark_svg}/>
</div>
</div>

34
src-ui/logics/common/useWindow.js
View File

@@ -1,5 +1,5 @@
import { useEffect, useRef } from "react";
import { getCurrentWindow, currentMonitor, availableMonitors, PhysicalPosition, PhysicalSize } from "@tauri-apps/api/window";
import { currentMonitor, availableMonitors, PhysicalPosition, PhysicalSize } from "@tauri-apps/api/window";
import { useStdoutToPython } from "@logics/useStdoutToPython";
import { useStore_IsBreakPoint } from "@store";
import { useUiScaling } from "@logics_configs";
@@ -10,9 +10,9 @@ export const useWindow = () => {
const { currentUiScaling } = useUiScaling();
const { updateIsBreakPoint } = useStore_IsBreakPoint();
const appWindow = store.appWindow;
const asyncGetWindowGeometry = async () => {
const appWindow = await getCurrentWindow();
try {
const position = await appWindow.outerPosition();
const { x: x_pos, y: y_pos } = position;
@@ -32,7 +32,6 @@ export const useWindow = () => {
};
const asyncSaveWindowGeometry = async () => {
const appWindow = await getCurrentWindow();
const minimized = await appWindow.isMinimized();
if (minimized === true) return; // don't save while the window is minimized.
const data = await asyncGetWindowGeometry();
@@ -40,8 +39,6 @@ export const useWindow = () => {
};
const restoreWindowGeometry = async (data) => {
const appWindow = await getCurrentWindow();
try {
const monitors = await availableMonitors();
const { x_pos, y_pos, width, height } = data;
@@ -95,7 +92,6 @@ export const useWindow = () => {
};
const asyncUpdateBreakPoint = async () => {
const appWindow = await getCurrentWindow();
const size = await appWindow.innerSize();
const dynamicBreakPoint = 800 * (currentUiScaling.data / 100);
updateIsBreakPoint(size.width <= dynamicBreakPoint);
@@ -109,10 +105,7 @@ export const useWindow = () => {
const unlistenMove = useRef(null);
useEffect(() => {
const setup = async () => {
if (store.is_register_window_geometry_controller) return;
const appWindow = await getCurrentWindow();
const setup = () => {
unlistenResize.current = appWindow.onResized(() => {
clearTimeout(resizeTimeout.current);
resizeTimeout.current = setTimeout(() => {
@@ -127,7 +120,6 @@ export const useWindow = () => {
asyncSaveWindowGeometry();
}, 200);
});
store.is_register_window_geometry_controller = true;
};
setup();
@@ -148,10 +140,30 @@ export const useWindow = () => {
return null;
};
const asyncToggleMaximizeApp = async () => {
const maximizeState = await appWindow.isMaximized();
if (!maximizeState) {
await appWindow.maximize();
} else {
await appWindow.unmaximize();
}
};
const asyncMinimizeApp = async () => {
await appWindow.minimize();
};
const asyncCloseApp = async () => {
await appWindow.close();
};
return {
WindowGeometryController,
asyncSaveWindowGeometry,
restoreWindowGeometry,
asyncUpdateBreakPoint,
asyncCloseApp,
asyncToggleMaximizeApp,
asyncMinimizeApp,
};
};

6
src-ui/logics/configs/hotkeys/useHotkeys.js
View File

@@ -1,5 +1,3 @@
import { getCurrentWindow } from "@tauri-apps/api/window";
import { store, useStore_Hotkeys } from "@store";
import { useStdoutToPython } from "@logics/useStdoutToPython";
import { useNotificationStatus } from "@logics_common";
@@ -7,6 +5,8 @@ import { useMainFunction } from "@logics_main";
import { register, unregisterAll, isRegistered } from "@tauri-apps/plugin-global-shortcut";
export const useHotkeys = () => {
const appWindow = store.appWindow;
const { asyncStdoutToPython } = useStdoutToPython();
const { currentHotkeys, updateHotkeys, pendingHotkeys } = useStore_Hotkeys();
const {
@@ -68,8 +68,6 @@ export const useHotkeys = () => {
if (!isAlreadyRegistered) {
await register(shortcut, async (event) => {
if (event.state !== "Pressed") return;
const appWindow = await getCurrentWindow();
switch (actionKey) {
case "toggle_vrct_visibility": {
const minimized = await appWindow.isMinimized();

8
src-ui/logics/main/useMainFunction.js
View File

@@ -1,4 +1,4 @@
import { getCurrentWindow } from "@tauri-apps/api/window";
import { store } from "@store";
import {
useStore_TranslationStatus,
@@ -6,10 +6,11 @@ import {
useStore_TranscriptionReceiveStatus,
useStore_ForegroundStatus,
} from "@store";
import { useCallback } from "react";
import { useStdoutToPython } from "@logics/useStdoutToPython";
export const useMainFunction = () => {
const appWindow = store.appWindow;
const {
currentTranslationStatus,
updateTranslationStatus,
@@ -76,9 +77,8 @@ export const useMainFunction = () => {
const toggleForeground = async () => {
const main_page = await getCurrentWindow();
const is_foreground_enabled = !currentForegroundStatus.data;
main_page.setAlwaysOnTop(is_foreground_enabled);
await appWindow.setAlwaysOnTop(is_foreground_enabled);
updateForegroundStatus(is_foreground_enabled);
};

4
src-ui/logics/main/useMessageInputBoxRatio.js
View File

@@ -1,8 +1,9 @@
import { getCurrentWindow } from "@tauri-apps/api/window";
import { store } from "@store";
import { useStore_MessageInputBoxRatio } from "@store";
import { useStdoutToPython } from "@logics/useStdoutToPython";
import { clampMinMax } from "@utils";
export const useMessageInputBoxRatio = () => {
const appWindow = store.appWindow;
const { asyncStdoutToPython } = useStdoutToPython();
const { currentMessageInputBoxRatio, updateMessageInputBoxRatio } = useStore_MessageInputBoxRatio();
@@ -12,7 +13,6 @@ export const useMessageInputBoxRatio = () => {
};
const asyncSetMessageInputBoxRatio = async (ratio) => {
const appWindow = getCurrentWindow();
const minimized = await appWindow.isMinimized();
if (minimized === true) return; // don't save while the window is minimized.
const parsed = parseFloat(ratio.toFixed(2));