Additional improvements

sotch-pr35mac · Apr 29, 2024 · 15e6e00 · 15e6e00
1 parent 342867d
commit 15e6e00
Show file tree

Hide file tree

Showing 9 changed files with 400 additions and 482 deletions.
diff --git a/src/native/Cargo.lock b/src/native/Cargo.lock
diff --git a/src/native/src/main.rs b/src/native/src/main.rs
@@ -147,8 +147,7 @@ fn main() {
 
             #[cfg(target_os = "macos")]
             {
-                // main_window.set_transparent_titlebar(ToolbarThickness::Thick);
-                // character_window.set_transparent_titlebar(ToolbarThickness::Medium);
+                character_window.set_transparent_titlebar(ToolbarThickness::Medium);
                 main_window
                     .lock()
                     .unwrap()
@@ -166,13 +165,12 @@ fn main() {
             main_window.lock().unwrap().on_window_event(move |event| {
                 match event {
                     WindowEvent::CloseRequested { .. } => {
-                        /* TODO(macos): When the app icon is clicked from the dock, open the main window.
-                         * Currently, Tuair doesn't offer a way to capture dock click events, so
-                         * for now we'll just clcose the application when the main window is
-                         * closed, like we do for other platforms.
+                        /* TODO(macos): When the app icon is clicked from the dock, open the main
+                         * window. Currently, Tauri doesn't offer a way to capture dock click
+                         * events, so for now we'll just clcose the application when the main
+                         * window is closed, like we do for other platforms.
                          */
 
-                        // When the main window is closed, emit an exit event.
                         handle.exit(0);
                     }
                     WindowEvent::Resized { .. } => {

diff --git a/src/native/tauri.conf.json b/src/native/tauri.conf.json
@@ -69,6 +69,8 @@
         "fullscreen": false,
         "height": 655,
         "width": 1110,
+        "minHeight": 567,
+        "minWidth": 567,
         "resizable": true,
         "title": "Syng",
         "url": "index.html",
@@ -81,6 +83,8 @@
         "fullscreen": false,
         "height": 497,
         "width": 886,
+        "minHeight": 497,
+        "minWidth": 886,
         "resizable": true,
         "title": "Syng | Characters",
         "visible": false,

diff --git a/src/views/characters.html b/src/views/characters.html
@@ -10,7 +10,12 @@
 		<link rel="stylesheet" href="templates/styles/syui.css">
 		<link rel="stylesheet" href="templates/build/bundle.css">
 		<script defer src="templates/build/bundle.js"></script>
+		<style>
+			.body {
+				overlfow: hidden;
+			}
+		</style>
 	</head>
 	<body id="characters">
 	</body>
-</html>
+</html>
diff --git a/src/views/templates/build/bundle.css.map b/src/views/templates/build/bundle.css.map
diff --git a/src/views/templates/build/bundle.js b/src/views/templates/build/bundle.js
diff --git a/src/views/templates/build/bundle.js.map b/src/views/templates/build/bundle.js.map
diff --git a/src/views/templates/components/Navigation/Navigation.svelte b/src/views/templates/components/Navigation/Navigation.svelte
@@ -75,16 +75,6 @@
 
 	// On macOS, listen for fullscreen to adjust navigation when traffic lights disappear.
 	$: if (isMacos) {
-		// window.__TAURI__.window.appWindow.onResized().then(() => {
-		// 	// The app window was resized. Let's check if the screen is maximized.
-		// 	window.__TAURI__.window.appWindow.isMaximized().then(fullscreen => {
-		// 		if (fullscreen) {
-		// 			console.log("The app is fullscreen");
-		// 		} else {
-		// 			console.log("The app is not fullscreen");
-		// 		}
-		// 	});
-		// });
 		window.__TAURI__.window.appWindow.onResized(() => {
 			window.__TAURI__.window.appWindow.isFullscreen().then(fullscreen => {
 				if (fullscreen) {
@@ -93,12 +83,6 @@
 					trafficLightMargin = true;
 				}
 			});
-		}).then(unlisten => {
-			console.log("We got unlisten back");
-			console.log(unlisten);
-		}).catch(e => {
-			console.log('There was an error doing this whole thing. Error = ');
-			console.log(e);
 		});
 	}
 

diff --git a/src/views/templates/styles/theme.css b/src/views/templates/styles/theme.css
@@ -111,4 +111,7 @@ body {
 	font-family: var(--sy-font-family);
 	color: var(--sy-color--black);
 	margin: 0;
-}
+	overflow: hidden;
+	user-select: none;
+	cursor: default;
+}