summaryrefslogtreecommitdiffstats
path: root/src/settings.rs
diff options
context:
space:
mode:
authorLibravatar hatoo <hato2000@gmail.com>2019-12-01 14:55:05 +0900
committerLibravatar hatoo <hato2000@gmail.com>2019-12-01 14:55:05 +0900
commita33f49ff4b1c11e467ec492a96e1e05e4d32d6aa (patch)
tree74b63593e76ebf2171365b7cdc39cd6c00921c45 /src/settings.rs
parent5077f1dc6a6aca5ab84dd89296fb70489393cf57 (diff)
downloadiced-a33f49ff4b1c11e467ec492a96e1e05e4d32d6aa.tar.gz
iced-a33f49ff4b1c11e467ec492a96e1e05e4d32d6aa.tar.bz2
iced-a33f49ff4b1c11e467ec492a96e1e05e4d32d6aa.zip
Remove platform-specific logic from iced
Make Window.platform_specific use iced_winit::settings::PlatformSpecific
Diffstat (limited to '')
-rw-r--r--src/settings.rs (renamed from src/settings/mod.rs)14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/settings/mod.rs b/src/settings.rs
index d64cfa13..a5820d87 100644
--- a/src/settings/mod.rs
+++ b/src/settings.rs
@@ -1,15 +1,5 @@
//! Configure your application.
-#[cfg(target_os = "windows")]
-#[path = "windows.rs"]
-pub mod platform;
-
-#[cfg(not(target_os = "windows"))]
-#[path = "not_windows.rs"]
-pub mod platform;
-
-pub use platform::PlatformSpecific;
-
/// The settings of an application.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub struct Settings {
@@ -34,7 +24,7 @@ pub struct Window {
pub decorations: bool,
/// Platform specific Setting.
- pub platform_specific: PlatformSpecific,
+ pub platform_specific: iced_winit::settings::PlatformSpecific,
}
impl Default for Window {
@@ -56,7 +46,7 @@ impl From<Settings> for iced_winit::Settings {
size: settings.window.size,
resizable: settings.window.resizable,
decorations: settings.window.decorations,
- platform_specific: settings.window.platform_specific.into(),
+ platform_specific: settings.window.platform_specific,
},
}
}