summaryrefslogtreecommitdiffstats
path: root/winit
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-03-05 06:35:20 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-03-05 06:35:20 +0100
commit99e0a71504456976ba88040f5d1d3bbc347694ea (patch)
treea228c064fd3847831ff8072aa9375dc59db47f47 /winit
parent8af69be47e88896b3c5f70174db609eee0c67971 (diff)
downloadiced-99e0a71504456976ba88040f5d1d3bbc347694ea.tar.gz
iced-99e0a71504456976ba88040f5d1d3bbc347694ea.tar.bz2
iced-99e0a71504456976ba88040f5d1d3bbc347694ea.zip
Rename `iced_native` to `iced_runtime`
Diffstat (limited to 'winit')
-rw-r--r--winit/Cargo.toml6
-rw-r--r--winit/src/application.rs14
-rw-r--r--winit/src/application/state.rs2
-rw-r--r--winit/src/clipboard.rs14
-rw-r--r--winit/src/lib.rs7
-rw-r--r--winit/src/system.rs4
-rw-r--r--winit/src/window.rs92
7 files changed, 16 insertions, 123 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 21c14f68..bfd22093 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["gui"]
[features]
trace = ["tracing", "tracing-core", "tracing-subscriber"]
chrome-trace = ["trace", "tracing-chrome"]
-debug = ["iced_native/debug"]
+debug = ["iced_runtime/debug"]
system = ["sysinfo"]
application = []
@@ -27,9 +27,9 @@ version = "0.27"
git = "https://github.com/iced-rs/winit.git"
rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
-[dependencies.iced_native]
+[dependencies.iced_runtime]
version = "0.9"
-path = "../native"
+path = "../runtime"
[dependencies.iced_graphics]
version = "0.7"
diff --git a/winit/src/application.rs b/winit/src/application.rs
index d863c846..9666fcae 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -16,10 +16,10 @@ use crate::core::{Event, Size};
use crate::futures::futures;
use crate::futures::{Executor, Runtime, Subscription};
use crate::graphics::compositor::{self, Compositor};
-use crate::native::clipboard;
-use crate::native::program::Program;
-use crate::native::user_interface::{self, UserInterface};
-use crate::native::{Command, Debug};
+use crate::runtime::clipboard;
+use crate::runtime::program::Program;
+use crate::runtime::user_interface::{self, UserInterface};
+use crate::runtime::{Command, Debug};
use crate::style::application::{Appearance, StyleSheet};
use crate::{Clipboard, Error, Proxy, Settings};
@@ -709,9 +709,9 @@ pub fn run_command<A, E>(
E: Executor,
<A::Renderer as core::Renderer>::Theme: StyleSheet,
{
- use iced_native::command;
- use iced_native::system;
- use iced_native::window;
+ use crate::runtime::command;
+ use crate::runtime::system;
+ use crate::runtime::window;
for action in command.actions() {
match action {
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index b727e03c..c37ccca6 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -3,7 +3,7 @@ use crate::conversion;
use crate::core;
use crate::core::{Color, Point, Size};
use crate::graphics::Viewport;
-use crate::native::Debug;
+use crate::runtime::Debug;
use crate::Application;
use std::marker::PhantomData;
diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 22509130..7271441d 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -1,6 +1,4 @@
//! Access the clipboard.
-use crate::native::clipboard::Action;
-use crate::native::command::{self, Command};
/// A buffer for short-term storage and transfer within and between
/// applications.
@@ -64,15 +62,3 @@ impl crate::core::Clipboard for Clipboard {
self.write(contents)
}
}
-
-/// Read the current contents of the clipboard.
-pub fn read<Message>(
- f: impl Fn(Option<String>) -> Message + 'static,
-) -> Command<Message> {
- Command::single(command::Action::Clipboard(Action::Read(Box::new(f))))
-}
-
-/// Write the given contents to the clipboard.
-pub fn write<Message>(contents: String) -> Command<Message> {
- Command::single(command::Action::Clipboard(Action::Write(contents)))
-}
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 0d8c04d3..5cde510a 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -31,9 +31,9 @@
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
#![cfg_attr(docsrs, feature(doc_cfg))]
pub use iced_graphics as graphics;
-pub use iced_native as native;
-pub use iced_native::core;
-pub use iced_native::futures;
+pub use iced_runtime as runtime;
+pub use iced_runtime::core;
+pub use iced_runtime::futures;
pub use iced_style as style;
pub use winit;
@@ -42,7 +42,6 @@ pub mod application;
pub mod clipboard;
pub mod conversion;
pub mod settings;
-pub mod window;
#[cfg(feature = "system")]
pub mod system;
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 3a6a8a8e..069efa29 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -1,7 +1,7 @@
//! Access the native system.
use crate::graphics::compositor;
-use crate::native::command::{self, Command};
-use crate::native::system::{Action, Information};
+use crate::runtime::command::{self, Command};
+use crate::runtime::system::{Action, Information};
/// Query for available system information.
pub fn fetch_information<Message>(
diff --git a/winit/src/window.rs b/winit/src/window.rs
deleted file mode 100644
index 6ac58e20..00000000
--- a/winit/src/window.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-//! Interact with the window of your application.
-use crate::core::window::{Mode, UserAttention};
-use crate::native::command::{self, Command};
-use crate::native::window::Action;
-
-/// Closes the current window and exits the application.
-pub fn close<Message>() -> Command<Message> {
- Command::single(command::Action::Window(Action::Close))
-}
-
-/// Begins dragging the window while the left mouse button is held.
-pub fn drag<Message>() -> Command<Message> {
- Command::single(command::Action::Window(Action::Drag))
-}
-
-/// Resizes the window to the given logical dimensions.
-pub fn resize<Message>(width: u32, height: u32) -> Command<Message> {
- Command::single(command::Action::Window(Action::Resize { width, height }))
-}
-
-/// Maximizes the window.
-pub fn maximize<Message>(maximized: bool) -> Command<Message> {
- Command::single(command::Action::Window(Action::Maximize(maximized)))
-}
-
-/// Minimes the window.
-pub fn minimize<Message>(minimized: bool) -> Command<Message> {
- Command::single(command::Action::Window(Action::Minimize(minimized)))
-}
-
-/// Moves a window to the given logical coordinates.
-pub fn move_to<Message>(x: i32, y: i32) -> Command<Message> {
- Command::single(command::Action::Window(Action::Move { x, y }))
-}
-
-/// Sets the [`Mode`] of the window.
-pub fn change_mode<Message>(mode: Mode) -> Command<Message> {
- Command::single(command::Action::Window(Action::ChangeMode(mode)))
-}
-
-/// Fetches the current [`Mode`] of the window.
-pub fn fetch_mode<Message>(
- f: impl FnOnce(Mode) -> Message + 'static,
-) -> Command<Message> {
- Command::single(command::Action::Window(Action::FetchMode(Box::new(f))))
-}
-
-/// Toggles the window to maximized or back.
-pub fn toggle_maximize<Message>() -> Command<Message> {
- Command::single(command::Action::Window(Action::ToggleMaximize))
-}
-
-/// Toggles the window decorations.
-pub fn toggle_decorations<Message>() -> Command<Message> {
- Command::single(command::Action::Window(Action::ToggleDecorations))
-}
-
-/// Request user attention to the window, this has no effect if the application
-/// is already focused. How requesting for user attention manifests is platform dependent,
-/// see [`UserAttention`] for details.
-///
-/// Providing `None` will unset the request for user attention. Unsetting the request for
-/// user attention might not be done automatically by the WM when the window receives input.
-pub fn request_user_attention<Message>(
- user_attention: Option<UserAttention>,
-) -> Command<Message> {
- Command::single(command::Action::Window(Action::RequestUserAttention(
- user_attention,
- )))
-}
-
-/// Brings the window to the front and sets input focus. Has no effect if the window is
-/// already in focus, minimized, or not visible.
-///
-/// This [`Command`] steals input focus from other applications. Do not use this method unless
-/// you are certain that's what the user wants. Focus stealing can cause an extremely disruptive
-/// user experience.
-pub fn gain_focus<Message>() -> Command<Message> {
- Command::single(command::Action::Window(Action::GainFocus))
-}
-
-/// Changes whether or not the window will always be on top of other windows.
-pub fn change_always_on_top<Message>(on_top: bool) -> Command<Message> {
- Command::single(command::Action::Window(Action::ChangeAlwaysOnTop(on_top)))
-}
-
-/// Fetches an identifier unique to the window.
-pub fn fetch_id<Message>(
- f: impl FnOnce(u64) -> Message + 'static,
-) -> Command<Message> {
- Command::single(command::Action::Window(Action::FetchId(Box::new(f))))
-}