Made Ensemble Timer gain focus when switching.

Author: Zachary Rogers

electron/communicationBridge/customCommandReceiver.ts

@@ -1,5 +1,6 @@
 import { BrowserWindow, screen, ipcMain } from 'electron';
 import { customCommandChannelName } from './constants';
+import { app } from 'electron';
 
 export function createCustomCommandReceiver({
   window,
@@ -18,6 +19,9 @@ export function createCustomCommandReceiver({
       case 'move-window-to-opposite-corner':
         moveWindowToOppositeCorner({ window });
         break;
+      case 'focus':
+        focus();
+        break;
       default:
         console.warn('UH OH no command found for: ', message);
         break;
@@ -60,3 +64,7 @@ function toggleMaximize({ window }: { window: BrowserWindow }) {
     window.maximize();
   }
 }
+
+function focus() {
+  app.focus({ steal: true });
+}

src/pages/EditEnsemble.tsx

@@ -21,15 +21,15 @@ import { Button } from '@/components/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { BreakProgress } from '@/components/BreakProgress';
 import { Separator } from '@/components/ui/separator';
+import { sendMessage } from '@/communicationBridge/rendererCommunicationBridge';
+import { customCommandChannelName } from '../../electron/communicationBridge/constants';
 
 export function EditEnsemble() {
   useEffect(() => {
     RendererWindowBrowser.setOpacity(1.0);
+    sendMessage({ channel: customCommandChannelName, message: 'focus' });
     RendererWindowBrowser.maximize();
     RendererWindowBrowser.setAlwaysOnTop(false);
-    RendererWindowBrowser.focus();
-    RendererWindowBrowser.moveTop();
-    RendererWindowBrowser.setIgnoreMouseEvents(false);
   }, []);
 
   const { startProgramming } = useAppStore((state) => ({

src/pages/Handoff.tsx

@@ -1,4 +1,5 @@
 import { RendererWindowBrowser } from '@/communicationBridge/fakeWindowBrowser';
+import { sendMessage } from '@/communicationBridge/rendererCommunicationBridge';
 import { BreakProgress } from '@/components/BreakProgress';
 import { Settings } from '@/components/Settings';
 import {
@@ -15,16 +16,15 @@ import {
   getCurrentNavigator,
   useAppStore,
 } from '@/state.ts/defaultState';
+import { customCommandChannelName } from '../../electron/communicationBridge/constants';
 import { useEffect } from 'react';
 
 export function Handoff() {
   useEffect(() => {
     RendererWindowBrowser.setOpacity(1.0);
+    sendMessage({ channel: customCommandChannelName, message: 'focus' });
     RendererWindowBrowser.maximize();
     RendererWindowBrowser.setAlwaysOnTop(false);
-    RendererWindowBrowser.focus();
-    RendererWindowBrowser.moveTop();
-    RendererWindowBrowser.setIgnoreMouseEvents(false);
   }, []);
 
   const {

src/pages/WantABreak.tsx

@@ -1,18 +1,18 @@
 import { RendererWindowBrowser } from '@/communicationBridge/fakeWindowBrowser';
+import { sendMessage } from '@/communicationBridge/rendererCommunicationBridge';
 import { Settings } from '@/components/Settings';
 import { CoffeeIcon } from '@/components/icons/icons';
 import { Button } from '@/components/ui/button';
 import { useAppStore } from '@/state.ts/defaultState';
+import { customCommandChannelName } from '../../electron/communicationBridge/constants';
 import { useEffect } from 'react';
 
 export function WantABreak() {
   useEffect(() => {
     RendererWindowBrowser.setOpacity(1.0);
+    sendMessage({ channel: customCommandChannelName, message: 'focus' });
     RendererWindowBrowser.maximize();
     RendererWindowBrowser.setAlwaysOnTop(false);
-    RendererWindowBrowser.focus();
-    RendererWindowBrowser.moveTop();
-    RendererWindowBrowser.setIgnoreMouseEvents(false);
   }, []);
 
   const { takeBreak, skipBreak } = useAppStore((state) => ({