starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-23 09:08:32 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix window title moving stoplights (for now)

Browse Source
This commit is contained in:
Gregory Schier
2023-11-13 23:25:47 -08:00
parent c884cedfc2
commit 38422d59fd
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -840,6 +840,8 @@ fn create_window(handle: &AppHandle<Wry>, url: Option<&str>) -> Window<Wry> {
match e { match e {
WindowEvent::Resized(..) => apply_offset(), WindowEvent::Resized(..) => apply_offset(),
WindowEvent::ThemeChanged(..) => apply_offset(), WindowEvent::ThemeChanged(..) => apply_offset(),
WindowEvent::Focused(..) => apply_offset(),
WindowEvent::ScaleFactorChanged { .. } => apply_offset(),
WindowEvent::CloseRequested { .. } => { WindowEvent::CloseRequested { .. } => {
println!("CLOSE REQUESTED"); println!("CLOSE REQUESTED");
// api.prevent_close(); // api.prevent_close();

2
src-tauri/src/window_ext.rs
View File

@@ -10,7 +10,7 @@ pub trait TrafficLightWindowExt {
impl<R: Runtime> TrafficLightWindowExt for Window<R> { impl<R: Runtime> TrafficLightWindowExt for Window<R> {
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
fn position_traffic_lights(&self) { fn position_traffic_lights(&self) {
// No-op // No-op on other platforms
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]

6
src-web/hooks/useSyncWindowTitle.ts
View File

@@ -1,4 +1,3 @@
import { appWindow } from '@tauri-apps/api/window';
import { useEffect } from 'react'; import { useEffect } from 'react';
import { fallbackRequestName } from '../lib/fallbackRequestName'; import { fallbackRequestName } from '../lib/fallbackRequestName';
import { useActiveEnvironment } from './useActiveEnvironment'; import { useActiveEnvironment } from './useActiveEnvironment';
@@ -17,6 +16,9 @@ export function useSyncWindowTitle() {
if (activeRequest) { if (activeRequest) {
newTitle += ` – ${fallbackRequestName(activeRequest)}`; newTitle += ` – ${fallbackRequestName(activeRequest)}`;
} }
appWindow.setTitle(newTitle).catch(console.error);
console.log('Skipping setting window title to ', newTitle);
// TODO: This resets the stoplight position so we can't use it yet
// appWindow.setTitle(newTitle).catch(console.error);
}, [activeEnvironment, activeRequest, activeWorkspace]); }, [activeEnvironment, activeRequest, activeWorkspace]);
} }