Shikong/scrcpy-mask
1
0
Fork 0
mirror of https://github.com/AkiChase/scrcpy-mask synced 2024-11-12 20:11:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from AkiChase/41-bug-window-error-when-start

Browse Source 
fix(main): window default pos
This commit is contained in:
如初 2024-05-23 16:08:08 +08:00 committed by GitHub
commit a06dc4f811
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src-tauri/src/main.rs
View File

@ -207,19 +207,27 @@ async fn main() {
// restore window position and size // restore window position and size
match store.get("maskArea") { match store.get("maskArea") {
Some(value) => { Some(value) => {
let pos_x = value["posX"].as_i64().unwrap_or(100); let pos_x = value["posX"].as_i64();
let pos_y = value["posY"].as_i64().unwrap_or(100); let pos_y = value["posY"].as_i64();
let size_w = value["sizeW"].as_i64().unwrap_or(800); let size_w = value["sizeW"].as_i64().unwrap_or(800);
let size_h = value["sizeH"].as_i64().unwrap_or(600); let size_h = value["sizeH"].as_i64().unwrap_or(600);
let main_window: tauri::WebviewWindow = let main_window: tauri::WebviewWindow =
app.get_webview_window("main").unwrap(); app.get_webview_window("main").unwrap();
main_window.set_zoom(1.).unwrap_or(()); main_window.set_zoom(1.).unwrap_or(());
main_window
.set_position(tauri::Position::Logical(tauri::LogicalPosition { if pos_x.is_none() || pos_y.is_none() {
x: (pos_x - 70) as f64, main_window.center().unwrap_or(());
y: (pos_y - 30) as f64, } else {
})) main_window
.unwrap(); .set_position(tauri::Position::Logical(tauri::LogicalPosition {
x: (pos_x.unwrap() - 70) as f64,
y: (pos_y.unwrap() - 30) as f64,
}))
.unwrap();
}
main_window main_window
.set_size(tauri::Size::Logical(tauri::LogicalSize { .set_size(tauri::Size::Logical(tauri::LogicalSize {
width: (size_w + 70) as f64, width: (size_w + 70) as f64,
@ -230,23 +238,15 @@ async fn main() {
None => { None => {
let main_window: tauri::WebviewWindow = let main_window: tauri::WebviewWindow =
app.get_webview_window("main").unwrap(); app.get_webview_window("main").unwrap();
main_window.center().unwrap_or(());
main_window main_window
.set_size(tauri::Size::Logical(tauri::LogicalSize { .set_size(tauri::Size::Logical(tauri::LogicalSize {
width: (800 + 70) as f64, width: (800 + 70) as f64,
height: (600 + 30) as f64, height: (600 + 30) as f64,
})) }))
.unwrap(); .unwrap();
store
.insert(
"maskArea".to_string(),
serde_json::json!({
"posX": 0,
"posY": 0,
"sizeW": 800,
"sizeH": 600
}),
)
.unwrap();
} }
} }