Merged in iced master
This commit is contained in:
parent
63fb608d8b
commit
3c095aa3f0
4 changed files with 5 additions and 5 deletions
|
|
@ -901,7 +901,7 @@ pub fn run_command<A, E>(
|
|||
y,
|
||||
});
|
||||
}
|
||||
window::Action::SetMode(mode) => {
|
||||
window::Action::ChangeMode(mode) => {
|
||||
let window = windows.get(&id).expect("No window found");
|
||||
window.set_visible(conversion::visible(mode));
|
||||
window.set_fullscreen(conversion::fullscreen(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use crate::window::{Mode, UserAttention};
|
||||
use crate::window::{Mode, UserAttention, Settings};
|
||||
|
||||
use iced_futures::MaybeSend;
|
||||
use std::fmt;
|
||||
|
|
@ -16,7 +16,7 @@ pub enum Action<T> {
|
|||
/// Spawns a new window with the provided [`window::Settings`].
|
||||
Spawn {
|
||||
/// The settings of the [`Window`].
|
||||
settings: window::Settings,
|
||||
settings: Settings,
|
||||
},
|
||||
/// Resize the window.
|
||||
Resize {
|
||||
|
|
|
|||
|
|
@ -957,7 +957,7 @@ pub fn run_command<A, E>(
|
|||
y,
|
||||
});
|
||||
}
|
||||
window::Action::SetMode(mode) => {
|
||||
window::Action::ChangeMode(mode) => {
|
||||
let window = windows.get(&id).expect("No window found");
|
||||
window.set_visible(conversion::visible(mode));
|
||||
window.set_fullscreen(conversion::fullscreen(
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ pub fn move_to<Message>(id: window::Id, x: i32, y: i32) -> Command<Message> {
|
|||
|
||||
/// Changes the [`Mode`] of the window.
|
||||
pub fn change_mode<Message>(id: window::Id, mode: Mode) -> Command<Message> {
|
||||
Command::single(command::Action::Window(id, window::Action::SetMode(mode)))
|
||||
Command::single(command::Action::Window(id, window::Action::ChangeMode(mode)))
|
||||
}
|
||||
|
||||
/// Fetches the current [`Mode`] of the window.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue