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

[Update] Add feature Restore Main Window Geometry.

Browse Source 
Note: the toggle-able setting, to restore or don't, has removed for now.
This commit is contained in:
Sakamoto Shiina
2024-10-13 03:57:23 +09:00
parent 0c3b36a43d
commit 0582091908
12 changed files with 183 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-python/config.py
View File

@@ -445,7 +445,7 @@ class Config:
def MAIN_WINDOW_GEOMETRY(self, value):
if isinstance(value, dict) and set(value.keys()) == set(self.MAIN_WINDOW_GEOMETRY.keys()):
for key, value in value.items():
if isinstance(value, str):
if isinstance(value, int):
self._MAIN_WINDOW_GEOMETRY[key] = value
saveJson(self.PATH_CONFIG, inspect.currentframe().f_code.co_name, self.MAIN_WINDOW_GEOMETRY)
@@ -1106,10 +1106,10 @@ class Config:
self._UI_LANGUAGE = "en"
self._RESTORE_MAIN_WINDOW_GEOMETRY = True
self._MAIN_WINDOW_GEOMETRY = {
"x_pos": "0",
"y_pos": "0",
"width": "870",
"height": "654",
"x_pos": 0,
"y_pos": 0,
"width": 870,
"height": 654,
}
self._AUTO_MIC_SELECT = True
self._SELECTED_MIC_HOST = device_manager.getDefaultMicDevice()["host"]["name"]

2
src-tauri/Cargo.toml
View File

@@ -11,7 +11,7 @@ edition = "2021"
tauri-build = { version = "1", features = [] }
[dependencies]
tauri = { version = "1", features = [ "window-unmaximize", "window-close", "window-maximize", "window-minimize", "window-unminimize", "window-start-dragging", "window-set-decorations", "window-set-always-on-top", "shell-sidecar", "shell-open", "devtools"] }
tauri = { version = "1", features = [ "window-set-size", "window-set-position", "window-unmaximize", "window-close", "window-maximize", "window-minimize", "window-unminimize", "window-start-dragging", "window-set-decorations", "window-set-always-on-top", "shell-sidecar", "shell-open", "devtools"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
font-kit = "0.14.2"

2
src-tauri/tauri.conf.json
View File

@@ -17,6 +17,8 @@
"setAlwaysOnTop": true,
"setDecorations": true,
"close": true,
"setPosition": true,
"setSize": true,
"maximize": true,
"minimize": true,
"unmaximize": true,

15
src-ui/app/App.jsx
View File

@@ -6,6 +6,7 @@ import { ConfigPage } from "./config_page/ConfigPage";
import styles from "./App.module.scss";
export const App = () => {
const { WindowGeometryController } = useWindow();
return (
<div className={styles.container}>
<StartPythonFacadeComponent />
@@ -14,6 +15,7 @@ export const App = () => {
<UiSizeController />
<FontFamilyController />
<TransparencyController />
<WindowGeometryController />
<WindowTitleBar />
<div className={styles.pages_wrapper}>
@@ -24,6 +26,11 @@ export const App = () => {
);
};
import {
useWindow,
useVolume,
useIsOpenedConfigPage,
} from "@logics_common";
import {
useSoftwareVersion,
@@ -59,6 +66,8 @@ const StartPythonFacadeComponent = () => {
const hasRunRef = useRef(false);
const { asyncFetchFonts } = useAsyncFetchFonts();
const { fetchAndUpdateWindowGeometry } = useWindow();
const { getMicHostList } = useMicHostList();
const { getMicDeviceList } = useMicDeviceList();
const { getSpeakerDeviceList } = useSpeakerDeviceList();
@@ -97,6 +106,8 @@ const StartPythonFacadeComponent = () => {
asyncStartPython().then(() => {
startFeedingToWatchDog();
fetchAndUpdateWindowGeometry();
getUiLanguage();
getUiScaling();
getMessageLogUiScaling();
@@ -156,10 +167,6 @@ const UiLanguageController = () => {
};
import { useStore_MainFunctionsStateMemory } from "@store";
import {
useVolume,
useIsOpenedConfigPage,
} from "@logics_common";
const ConfigPageCloseTrigger = () => {
const { currentIsOpenedConfigPage } = useIsOpenedConfigPage();

22
src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
View File

@@ -9,12 +9,13 @@ import {
useMessageLogUiScaling,
useSelectedFontFamily,
useTransparency,
// useRestoreWindowGeometry,
} from "@logics_configs";
export const Appearance = () => {
const { t } = useTranslation();
const {
DropdownMenuContainer,
// DropdownMenuContainer,
// SliderContainer,
// CheckboxContainer,
// SwitchboxContainer,
@@ -33,6 +34,7 @@ export const Appearance = () => {
<MessageLogUiScalingContainer />
<FontFamilyContainer />
<TransparencyContainer />
{/* <RestoreWindowGeometryContainer /> */}
@@ -253,4 +255,20 @@ const TransparencyContainer = () => {
track={false}
/>
);
};
};
// import { CheckboxContainer } from "../components/useSettingBox";
// const RestoreWindowGeometryContainer = () => {
// const { t } = useTranslation();
// const { currentRestoreWindowGeometry, toggleRestoreWindowGeometry } = useRestoreWindowGeometry();
// return (
// <CheckboxContainer
// label={t("config_page.to_restore_main_page_geometry.label")}
// desc={t("config_page.to_restore_main_page_geometry.desc")}
// variable={currentRestoreWindowGeometry}
// toggleFunction={toggleRestoreWindowGeometry}
// />
// );
// };

19
src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx
View File

@@ -45,17 +45,16 @@ export const SliderContainer = (props) => {
);
};
export const CheckboxContainer = (props) => {
return (
<div className={styles.container}>
<LabelComponent label={props.label} desc={props.desc} />
<Checkbox {...props}/>
</div>
);
};
export const useSettingBox = () => {
const CheckboxContainer = (props) => {
return (
<div className={styles.container}>
<LabelComponent label={props.label} desc={props.desc} />
<Checkbox {...props}/>
</div>
);
};
const SwitchboxContainer = (props) => {
return (
<div className={styles.container}>

1
src-ui/logics/common/index.js
View File

@@ -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
View 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
View 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,
// };
// };

1
src-ui/logics/configs/index.js
View File

@@ -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";

12
src-ui/logics/useReceiveRoutes.js
View File

@@ -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,

1
src-ui/store.js
View File

@@ -99,6 +99,7 @@ const createAtomWithHook = (initialValue, base_name, options) => {
// Common
// export const { atomInstance: Atom_RestoreWindowGeometry, useHook: useStore_RestoreWindowGeometry } = createAtomWithHook(true, "RestoreWindowGeometry");
export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useStore_IsOpenedConfigPage } = createAtomWithHook(false, "IsOpenedConfigPage");
export const { atomInstance: Atom_MainFunctionsStateMemory, useHook: useStore_MainFunctionsStateMemory } = createAtomWithHook({
transcription_send: false,