summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-05-21 00:37:47 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-05-21 00:44:35 +0200
commite0e4ee73feead3f05730625c7e1917b63f0b384e (patch)
tree5cd934cc474a5aacc60359f6fe69a5b9d31fe45b /src
parenta1a5fcfd46622d5b18d1716aa2adb4659835ccf3 (diff)
downloadiced-e0e4ee73feead3f05730625c7e1917b63f0b384e.tar.gz
iced-e0e4ee73feead3f05730625c7e1917b63f0b384e.tar.bz2
iced-e0e4ee73feead3f05730625c7e1917b63f0b384e.zip
Implement `iced_glutin` :tada:
Diffstat (limited to 'src')
-rw-r--r--src/application.rs20
-rw-r--r--src/element.rs2
-rw-r--r--src/lib.rs2
-rw-r--r--src/settings.rs8
-rw-r--r--src/widget.rs24
5 files changed, 21 insertions, 35 deletions
diff --git a/src/application.rs b/src/application.rs
index 0ae2ec55..644a4824 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -188,19 +188,19 @@ pub trait Application: Sized {
{
#[cfg(not(target_arch = "wasm32"))]
{
- let wgpu_settings = iced_wgpu::Settings {
+ let glow_settings = iced_glow::Settings {
default_font: settings.default_font,
antialiasing: if settings.antialiasing {
- Some(iced_wgpu::settings::Antialiasing::MSAAx4)
+ Some(iced_glow::settings::Antialiasing::MSAAx4)
} else {
None
},
- ..iced_wgpu::Settings::default()
+ ..iced_glow::Settings::default()
};
- <Instance<Self> as iced_winit::Application>::run(
+ <Instance<Self> as iced_glutin::Application>::run(
settings.into(),
- wgpu_settings,
+ glow_settings,
);
}
@@ -212,11 +212,11 @@ pub trait Application: Sized {
struct Instance<A: Application>(A);
#[cfg(not(target_arch = "wasm32"))]
-impl<A> iced_winit::Application for Instance<A>
+impl<A> iced_glutin::Application for Instance<A>
where
A: Application,
{
- type Compositor = iced_wgpu::window::Compositor;
+ type Compositor = iced_glow::window::Compositor;
type Executor = A::Executor;
type Flags = A::Flags;
type Message = A::Message;
@@ -231,10 +231,10 @@ where
self.0.title()
}
- fn mode(&self) -> iced_winit::Mode {
+ fn mode(&self) -> iced_glutin::Mode {
match self.0.mode() {
- window::Mode::Windowed => iced_winit::Mode::Windowed,
- window::Mode::Fullscreen => iced_winit::Mode::Fullscreen,
+ window::Mode::Windowed => iced_glutin::Mode::Windowed,
+ window::Mode::Fullscreen => iced_glutin::Mode::Fullscreen,
}
}
diff --git a/src/element.rs b/src/element.rs
index e5356fb6..e7504615 100644
--- a/src/element.rs
+++ b/src/element.rs
@@ -3,7 +3,7 @@
/// This is an alias of an `iced_native` element with a default `Renderer`.
#[cfg(not(target_arch = "wasm32"))]
pub type Element<'a, Message> =
- iced_winit::Element<'a, Message, iced_wgpu::Renderer>;
+ iced_glutin::Element<'a, Message, iced_glow::Renderer>;
#[cfg(target_arch = "wasm32")]
pub use iced_web::Element;
diff --git a/src/lib.rs b/src/lib.rs
index 2c08268b..58cc141d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -207,7 +207,7 @@ pub use sandbox::Sandbox;
pub use settings::Settings;
#[cfg(not(target_arch = "wasm32"))]
-use iced_winit as runtime;
+use iced_glutin as runtime;
#[cfg(target_arch = "wasm32")]
use iced_web as runtime;
diff --git a/src/settings.rs b/src/settings.rs
index 01ad0ee0..36685763 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -51,10 +51,10 @@ impl<Flags> Settings<Flags> {
}
#[cfg(not(target_arch = "wasm32"))]
-impl<Flags> From<Settings<Flags>> for iced_winit::Settings<Flags> {
- fn from(settings: Settings<Flags>) -> iced_winit::Settings<Flags> {
- iced_winit::Settings {
- window: iced_winit::settings::Window {
+impl<Flags> From<Settings<Flags>> for iced_glutin::Settings<Flags> {
+ fn from(settings: Settings<Flags>) -> iced_glutin::Settings<Flags> {
+ iced_glutin::Settings {
+ window: iced_glutin::settings::Window {
size: settings.window.size,
resizable: settings.window.resizable,
decorations: settings.window.decorations,
diff --git a/src/widget.rs b/src/widget.rs
index e33a6b2c..eebf5f2a 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -18,29 +18,27 @@
//! [`text_input::State`]: text_input/struct.State.html
#[cfg(not(target_arch = "wasm32"))]
mod platform {
- pub use iced_wgpu::widget::{
+ pub use iced_glow::widget::{
button, checkbox, container, pane_grid, progress_bar, radio,
- scrollable, slider, text_input, Text,
+ scrollable, slider, text_input, Column, Row, Space, Text,
};
#[cfg(feature = "canvas")]
#[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
- pub use iced_wgpu::widget::canvas;
+ pub use iced_glow::widget::canvas;
#[cfg_attr(docsrs, doc(cfg(feature = "image")))]
pub mod image {
//! Display images in your user interface.
- pub use iced_winit::image::{Handle, Image};
+ pub use iced_glutin::image::{Handle, Image};
}
#[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
pub mod svg {
//! Display vector graphics in your user interface.
- pub use iced_winit::svg::{Handle, Svg};
+ pub use iced_glutin::svg::{Handle, Svg};
}
- pub use iced_winit::Space;
-
#[doc(no_inline)]
pub use {
button::Button, checkbox::Checkbox, container::Container, image::Image,
@@ -52,18 +50,6 @@ mod platform {
#[cfg(feature = "canvas")]
#[doc(no_inline)]
pub use canvas::Canvas;
-
- /// A container that distributes its contents vertically.
- ///
- /// This is an alias of an `iced_native` column with a default `Renderer`.
- pub type Column<'a, Message> =
- iced_winit::Column<'a, Message, iced_wgpu::Renderer>;
-
- /// A container that distributes its contents horizontally.
- ///
- /// This is an alias of an `iced_native` row with a default `Renderer`.
- pub type Row<'a, Message> =
- iced_winit::Row<'a, Message, iced_wgpu::Renderer>;
}
#[cfg(target_arch = "wasm32")]