diff options
| author | Kirill Chibisov <contact@kchibisov.com> | 2025-01-04 09:34:44 +0300 |
|---|---|---|
| committer | Kirill Chibisov <contact@kchibisov.com> | 2025-01-04 12:16:42 +0300 |
| commit | e79f4b22d809d12b5f09543872443d0fa818fee2 (patch) | |
| tree | ce41efeedf0fdef4e224582f2c383775f6024a39 /alacritty/src/window_context.rs | |
| parent | 8cb359ad024736bba5456999a67f2a426529dcc7 (diff) | |
| download | r-alacritty-e79f4b22d809d12b5f09543872443d0fa818fee2.tar.gz r-alacritty-e79f4b22d809d12b5f09543872443d0fa818fee2.tar.bz2 r-alacritty-e79f4b22d809d12b5f09543872443d0fa818fee2.zip | |
Pass activation token in alacritty msg create-window
Fixes #8337.
Diffstat (limited to 'alacritty/src/window_context.rs')
| -rw-r--r-- | alacritty/src/window_context.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/alacritty/src/window_context.rs b/alacritty/src/window_context.rs index cfc3cd96..e3c39382 100644 --- a/alacritty/src/window_context.rs +++ b/alacritty/src/window_context.rs @@ -73,7 +73,7 @@ impl WindowContext { event_loop: &ActiveEventLoop, proxy: EventLoopProxy<Event>, config: Rc<UiConfig>, - options: WindowOptions, + mut options: WindowOptions, ) -> Result<Self, Box<dyn Error>> { let raw_display_handle = event_loop.display_handle().unwrap().as_raw(); @@ -83,7 +83,7 @@ impl WindowContext { // Windows has different order of GL platform initialization compared to any other platform; // it requires the window first. #[cfg(windows)] - let window = Window::new(event_loop, &config, &identity)?; + let window = Window::new(event_loop, &config, &identity, &mut options)?; #[cfg(windows)] let raw_window_handle = Some(window.raw_window_handle()); @@ -102,10 +102,9 @@ impl WindowContext { event_loop, &config, &identity, + &mut options, #[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))] gl_config.x11_visual(), - #[cfg(target_os = "macos")] - &options.window_tabbing_id, )?; // Create context. @@ -123,7 +122,7 @@ impl WindowContext { event_loop: &ActiveEventLoop, proxy: EventLoopProxy<Event>, config: Rc<UiConfig>, - options: WindowOptions, + mut options: WindowOptions, config_overrides: ParsedOptions, ) -> Result<Self, Box<dyn Error>> { let gl_display = gl_config.display(); @@ -135,10 +134,9 @@ impl WindowContext { event_loop, &config, &identity, + &mut options, #[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))] gl_config.x11_visual(), - #[cfg(target_os = "macos")] - &options.window_tabbing_id, )?; // Create context. |