Make cross-platform window size adjustments

src-tauri/src/main.rs

@@ -25,7 +25,6 @@ use tauri_specta::ts;
 use tokio::sync::Mutex;
 
 use cli::{Cli, Commands};
-#[cfg(target_os = "macos")]
 use commands::preferences::get_preferences_file_contents;
 use commands::{
     chat, export_db, get_api_call, get_api_calls, get_api_keys, get_preferences,
@@ -79,19 +78,25 @@ fn main() {
                             });
                     });
 
+                    let prefs = get_preferences_file_contents(&config_dir)?;
                     #[cfg(target_os = "macos")]
-                    {
-                        let prefs = get_preferences_file_contents(&config_dir)?;
-                        if prefs.high_dpi_adjust.is_none()
-                            || prefs.high_dpi_adjust.unwrap()
-                        {
-                            app.get_window("main")
-                                .ok_or(anyhow::anyhow!("No main window"))?
-                                .set_size(tauri::Size::Logical(tauri::LogicalSize {
-                                    width: 666.6,  // 800 * 0.8333...
-                                    height: 500.0, // 600 * 0.8333...
-                                }))?;
-                        }
+                    let high_dpi_adjust_on = prefs.high_dpi_adjust.unwrap_or(true);
+                    #[cfg(not(target_os = "macos"))]
+                    let high_dpi_adjust_on = prefs.high_dpi_adjust.unwrap_or(false);
+                    if high_dpi_adjust_on {
+                        app.get_window("main")
+                            .ok_or(anyhow::anyhow!("No main window"))?
+                            .set_size(tauri::Size::Logical(tauri::LogicalSize {
+                                width: 708.0,  // 850 * 0.8333...
+                                height: 541.0, // 650 * 0.8333...
+                            }))?;
+                    } else {
+                        app.get_window("main")
+                            .ok_or(anyhow::anyhow!("No main window"))?
+                            .set_size(tauri::Size::Logical(tauri::LogicalSize {
+                                width: 850.0,
+                                height: 650.0,
+                            }))?;
                     }
 
                     Ok(())

webdriver/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "types": ["node", "@wdio/globals/types"]
+  }
+}

webdriver/wdio.conf.ts

@@ -36,6 +36,14 @@ exports.config = {
       stdio: [null, process.stdout, process.stderr],
     })),
 
+  before: (
+    _capabilities: Record<string, unknown>[],
+    _specs: string[],
+    browser: WebdriverIO.Browser,
+  ) => {
+    browser.setWindowSize(850, 650);
+  },
+
   // clean up the `tauri-driver` process we spawned at the start of the session
   afterSession: () => tauriDriver.kill(),
 
@@ -44,7 +52,7 @@ exports.config = {
       "image-comparison",
       {
         baselineFolder: join(process.cwd(), "./screenshots/baseline/"),
-        formatImageName: "{tag}-{width}x{height}",
+        formatImageName: "{tag}",
         screenshotPath: join(process.cwd(), "./screenshots/testing/"),
         savePerInstance: true,
         autoSaveBaseline: true,