diff options
| author |  Nico Burns <nico@nicoburns.com> | 2023-02-27 23:44:31 +0000 |
|---|---|---|
| committer | Nico Burns <nico@nicoburns.com> | 2023-05-11 17:00:08 +0100 |
| commit | a5fbfe7ea5e73218af1befe02eb364afad2d6c55 (patch) | |
| tree | c6cda73366408f10f3633044888ff3dc817612bd /winit | |
| parent | cf434236e7e15e0fa05e5915b8d4d78dcaf1b7e8 (diff) | |
| download | iced-a5fbfe7ea5e73218af1befe02eb364afad2d6c55.tar.gz iced-a5fbfe7ea5e73218af1befe02eb364afad2d6c55.tar.bz2 iced-a5fbfe7ea5e73218af1befe02eb364afad2d6c55.zip | |
Update to winit 0.28
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/Cargo.toml | 8 | ||||
| -rw-r--r-- | winit/src/application.rs | 7 | ||||
| -rw-r--r-- | winit/src/settings.rs | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 58e13b3e..56efbe77 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -23,14 +23,14 @@ wayland-dlopen = ["winit/wayland-dlopen"] wayland-csd-adwaita = ["winit/wayland-csd-adwaita"] [dependencies] -window_clipboard = "0.2" +window_clipboard = { git = "https://github.com/TobTobXX/window_clipboard", rev = "1392da8339c8aebb9849d00eb7383a73ed076f1d" } log = "0.4" thiserror = "1.0" [dependencies.winit] -version = "0.27" -git = "https://github.com/iced-rs/winit.git" -rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c" +version = "0.28" +git = "https://github.com/nicoburns/winit.git" +rev = "f160dc321eaa2e30f770f0b61f7ffc74541cafe0" default-features = false [dependencies.iced_runtime] diff --git a/winit/src/application.rs b/winit/src/application.rs index 3d7c6e5d..1141ba27 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -26,6 +26,7 @@ use crate::{Clipboard, Error, Proxy, Settings}; use futures::channel::mpsc; use std::mem::ManuallyDrop; +use winit::window::WindowLevel; #[cfg(feature = "trace")] pub use profiler::Profiler; @@ -795,7 +796,11 @@ pub fn run_command<A, E>( window.focus_window(); } window::Action::ChangeAlwaysOnTop(on_top) => { - window.set_always_on_top(on_top); + let level = match on_top { + true => WindowLevel::AlwaysOnTop, + false => WindowLevel::Normal, + }; + window.set_window_level(level); } window::Action::FetchId(tag) => { proxy diff --git a/winit/src/settings.rs b/winit/src/settings.rs index be0ab329..413ae64a 100644 --- a/winit/src/settings.rs +++ b/winit/src/settings.rs @@ -26,7 +26,7 @@ use crate::core::window::Icon; use crate::Position; use winit::monitor::MonitorHandle; -use winit::window::WindowBuilder; +use winit::window::{WindowBuilder, WindowLevel}; use std::fmt; @@ -121,6 +121,10 @@ impl Window { let (width, height) = self.size; + let window_level = match self.always_on_top { + true => WindowLevel::AlwaysOnTop, + false => WindowLevel::Normal, + }; window_builder = window_builder .with_title(title) .with_inner_size(winit::dpi::LogicalSize { width, height }) @@ -128,7 +132,7 @@ impl Window { .with_decorations(self.decorations) .with_transparent(self.transparent) .with_window_icon(self.icon.and_then(conversion::icon)) - .with_always_on_top(self.always_on_top) + .with_window_level(window_level) .with_visible(self.visible); if let Some(position) = conversion::position( |