[Update] Add feature Restore Main Window Geometry.
Note: the toggle-able setting, to restore or don't, has removed for now.
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
export { useWindow } from "./useWindow";
|
||||
export { useIsOpenedConfigPage } from "./useIsOpenedConfigPage";
|
||||
export { useMessage } from "./useMessage";
|
||||
export { useVolume } from "./useVolume";
|
||||
92
src-ui/logics/common/useWindow.js
Normal file
92
src-ui/logics/common/useWindow.js
Normal file
@@ -0,0 +1,92 @@
|
||||
import { useStdoutToPython } from "@logics/useStdoutToPython";
|
||||
import { useEffect } from "react";
|
||||
import { appWindow, currentMonitor, LogicalPosition, LogicalSize } from "@tauri-apps/api/window";
|
||||
|
||||
export const useWindow = () => {
|
||||
const { asyncStdoutToPython } = useStdoutToPython();
|
||||
const asyncGetWindowGeometry = async () => {
|
||||
try {
|
||||
const position = await appWindow.outerPosition();
|
||||
const { x, y } = position;
|
||||
|
||||
const size = await appWindow.outerSize();
|
||||
const { width, height } = size;
|
||||
|
||||
return {
|
||||
x_pos: x,
|
||||
y_pos: y,
|
||||
width: width,
|
||||
height: height
|
||||
};
|
||||
} catch (err) {
|
||||
console.error("Error getting window position and size:", err);
|
||||
}
|
||||
};
|
||||
|
||||
const asyncSaveWindowGeometry = async () => {
|
||||
const data = await asyncGetWindowGeometry();
|
||||
asyncStdoutToPython("/set/data/main_window_geometry", data);
|
||||
};
|
||||
|
||||
const restoreWindowGeometry = async (data) => {
|
||||
try {
|
||||
const monitor = await currentMonitor();
|
||||
|
||||
if (monitor) {
|
||||
const { width: monitorWidth, height: monitorHeight } = monitor.size;
|
||||
|
||||
let width = Math.min(parseInt(data.width), monitorWidth);
|
||||
let height = Math.min(parseInt(data.height), monitorHeight);
|
||||
|
||||
const x = parseInt(data.x_pos);
|
||||
const y = parseInt(data.y_pos);
|
||||
|
||||
await appWindow.setPosition(new LogicalPosition(x, y));
|
||||
await appWindow.setSize(new LogicalSize(width, height));
|
||||
} else {
|
||||
console.error("Monitor information could not be retrieved.");
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Error setting window position and size:", err);
|
||||
}
|
||||
};
|
||||
|
||||
const fetchAndUpdateWindowGeometry = () => {
|
||||
asyncStdoutToPython("/get/data/main_window_geometry");
|
||||
};
|
||||
|
||||
const WindowGeometryController = () => {
|
||||
useEffect(() => {
|
||||
let resizeTimeout;
|
||||
const unlistenResize = appWindow.onResized(() => {
|
||||
clearTimeout(resizeTimeout);
|
||||
resizeTimeout = setTimeout(asyncSaveWindowGeometry, 200);
|
||||
});
|
||||
|
||||
return () => {
|
||||
unlistenResize.then((dispose) => dispose());
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
let moveTimeout;
|
||||
const unlistenMove = appWindow.onMoved(() => {
|
||||
clearTimeout(moveTimeout);
|
||||
moveTimeout = setTimeout(asyncSaveWindowGeometry, 200);
|
||||
});
|
||||
|
||||
return () => {
|
||||
unlistenMove.then((dispose) => dispose());
|
||||
};
|
||||
}, []);
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
return {
|
||||
WindowGeometryController,
|
||||
asyncSaveWindowGeometry,
|
||||
fetchAndUpdateWindowGeometry,
|
||||
restoreWindowGeometry,
|
||||
};
|
||||
};
|
||||
28
src-ui/logics/configs/appearance/useRestoreWindowGeometry.js
Normal file
28
src-ui/logics/configs/appearance/useRestoreWindowGeometry.js
Normal file
@@ -0,0 +1,28 @@
|
||||
// import { useStore_RestoreWindowGeometry } from "@store";
|
||||
// import { useStdoutToPython } from "@logics/useStdoutToPython";
|
||||
|
||||
// export const useRestoreWindowGeometry = () => {
|
||||
// const { asyncStdoutToPython } = useStdoutToPython();
|
||||
// const { currentRestoreWindowGeometry, updateRestoreWindowGeometry, pendingRestoreWindowGeometry } = useStore_RestoreWindowGeometry();
|
||||
|
||||
// const getRestoreWindowGeometry = () => {
|
||||
// pendingRestoreWindowGeometry();
|
||||
// asyncStdoutToPython("/get/data/restore_main_window_geometry");
|
||||
// };
|
||||
|
||||
// const toggleRestoreWindowGeometry = () => {
|
||||
// pendingRestoreWindowGeometry();
|
||||
// if (currentRestoreWindowGeometry.data) {
|
||||
// asyncStdoutToPython("/set/disable/restore_main_window_geometry");
|
||||
// } else {
|
||||
// asyncStdoutToPython("/set/enable/restore_main_window_geometry");
|
||||
// }
|
||||
// };
|
||||
|
||||
// return {
|
||||
// currentRestoreWindowGeometry,
|
||||
// getRestoreWindowGeometry,
|
||||
// toggleRestoreWindowGeometry,
|
||||
// updateRestoreWindowGeometry,
|
||||
// };
|
||||
// };
|
||||
@@ -10,6 +10,7 @@ export { useSpeakerDeviceList } from "./device/useSpeakerDeviceList";
|
||||
export { useSpeakerThreshold } from "./device/useSpeakerThreshold";
|
||||
|
||||
export { useMessageLogUiScaling } from "./appearance/useMessageLogUiScaling";
|
||||
// export { useRestoreWindowGeometry } from "./appearance/useRestoreWindowGeometry";
|
||||
export { useSelectedFontFamily } from "./appearance/useSelectedFontFamily";
|
||||
export { useSendMessageButtonType } from "./appearance/useSendMessageButtonType";
|
||||
export { useTransparency } from "./appearance/useTransparency";
|
||||
|
||||
@@ -2,6 +2,7 @@ import { translator_status } from "@data";
|
||||
import { arrayToObject } from "@utils/arrayToObject";
|
||||
|
||||
import {
|
||||
useWindow,
|
||||
useMessage,
|
||||
useVolume,
|
||||
} from "@logics_common";
|
||||
@@ -33,9 +34,11 @@ import {
|
||||
useUiScaling,
|
||||
useMessageLogUiScaling,
|
||||
useTransparency,
|
||||
// useRestoreWindowGeometry,
|
||||
} from "@logics_configs";
|
||||
|
||||
export const useReceiveRoutes = () => {
|
||||
const { restoreWindowGeometry } = useWindow();
|
||||
const { updateIsMainPageCompactMode } = useIsMainPageCompactMode();
|
||||
const {
|
||||
updateTranslationStatus,
|
||||
@@ -82,10 +85,15 @@ export const useReceiveRoutes = () => {
|
||||
const { updateMessageInputBoxRatio } = useMessageInputBoxRatio();
|
||||
const { updateSelectedFontFamily } = useSelectedFontFamily();
|
||||
const { updateTransparency } = useTransparency();
|
||||
// const { updateRestoreWindowGeometry } = useRestoreWindowGeometry();
|
||||
|
||||
|
||||
const routes = {
|
||||
// Common
|
||||
"/run/feed_watchdog": () => {},
|
||||
"/get/data/main_window_geometry": restoreWindowGeometry,
|
||||
"/set/data/main_window_geometry": () => {},
|
||||
|
||||
// Main Page
|
||||
// Page Controls
|
||||
"/get/data/main_window_sidebar_compact_mode": updateIsMainPageCompactMode,
|
||||
@@ -222,6 +230,10 @@ export const useReceiveRoutes = () => {
|
||||
"/get/data/transparency": updateTransparency,
|
||||
"/set/data/transparency": updateTransparency,
|
||||
|
||||
// "/get/data/restore_main_window_geometry": updateRestoreWindowGeometry,
|
||||
// "/set/enable/restore_main_window_geometry": updateRestoreWindowGeometry,
|
||||
// "/set/disable/restore_main_window_geometry": updateRestoreWindowGeometry,
|
||||
|
||||
// Others Tab
|
||||
"/get/data/auto_clear_message_box": updateEnableAutoClearMessageBox,
|
||||
"/set/enable/auto_clear_message_box": updateEnableAutoClearMessageBox,
|
||||
|
||||
Reference in New Issue
Block a user