fix show/hide bug; use CSS vs Electron where possible

lacymorrow · Jun 5, 2023 · 65c3583 · 65c3583
1 parent ecc32af
commit 65c3583
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/src/main/windows.js b/src/main/windows.js
@@ -372,15 +372,20 @@ const center = options => {
 
 const showWindow = () => {
 
-	each( win => win.showInactive() )
+	// Todo: showInactive() can be used in later versions of Electron
+	// each( win => win.showInactive() )
+
+	windows.win.webContents.send( 'remove_class', 'hidden' )
 	windows.hidden = false
 
 }
 
 const hideWindow = () => {
 
-	each( win => win.hide() )
+	// Previously:
+	// each( win => win.hide() )
 
+	windows.win.webContents.send( 'add_class', 'hidden' )
 	windows.hidden = true
 
 }
@@ -398,8 +403,6 @@ const showHideWindow = () => {
 
 	}
 
-	windows.hidden = !windows.hidden
-
 }
 
 const moveToNextDisplay = options => {

diff --git a/src/renderer/preload.js b/src/renderer/preload.js
@@ -41,7 +41,7 @@ const api = {
 	receive( channel, func ) {
 
 		const validChannels = new Set( [
-			'add_class', 'notify', 'lock_window', 'preload_sounds', 'play_sound', 'set_crosshair', 'set_info_icon', 'set_properties', 'set_reticle',
+			'add_class', 'remove_class', 'notify', 'lock_window', 'preload_sounds', 'play_sound', 'set_crosshair', 'set_info_icon', 'set_properties', 'set_reticle',
 		] )
 
 		if ( validChannels.has( channel ) ) {

diff --git a/src/renderer/renderer.js b/src/renderer/renderer.js
@@ -60,6 +60,7 @@
 
 	} )
 
+	// Add/Remove classes
 	window.crossover.receive( 'add_class', arg => {
 
 		// Trigger things
@@ -78,6 +79,12 @@
 
 	} )
 
+	window.crossover.receive( 'remove_class', arg => {
+
+		document.body.classList.remove( arg )
+
+	} )
+
 	// Sounds
 	window.crossover.receive( 'preload_sounds', arg => {
 

diff --git a/src/renderer/styles/dist/index.css b/src/renderer/styles/dist/index.css
diff --git a/src/renderer/styles/dist/index.css.map b/src/renderer/styles/dist/index.css.map
diff --git a/src/renderer/styles/index.scss b/src/renderer/styles/index.scss
@@ -95,9 +95,6 @@ body {
     font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
     text-rendering: optimizeLegibility;
     font-feature-settings: 'liga', 'clig', 'kern';
-    &.hidden {
-        display: none;
-    }
 
 }
 
@@ -496,3 +493,8 @@ label {
     display: flex;
     justify-content: space-between;
 }
+
+.hidden {
+	display: none;
+	pointer-events: none;
+}