Skip to content

Commit

Permalink
Re-export settings::PlatformSpecific from iced_winit directly
Browse files Browse the repository at this point in the history
  • Loading branch information
hecrj committed Mar 14, 2023
1 parent ed7b613 commit 4405a3d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 42 deletions.
16 changes: 3 additions & 13 deletions src/window/settings.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
use crate::window::{Icon, Position};

#[cfg(target_os = "macos")]
#[path = "settings/macos.rs"]
mod platform;

#[cfg(not(target_os = "macos"))]
#[path = "settings/other.rs"]
mod platform;

pub use platform::PlatformSpecific;
pub use iced_winit::settings::PlatformSpecific;

/// The window settings of an application.
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -44,7 +36,7 @@ pub struct Settings {
pub icon: Option<Icon>,

/// Platform specific settings.
pub platform_specific: platform::PlatformSpecific,
pub platform_specific: PlatformSpecific,
}

impl Default for Settings {
Expand Down Expand Up @@ -78,9 +70,7 @@ impl From<Settings> for iced_winit::settings::Window {
transparent: settings.transparent,
always_on_top: settings.always_on_top,
icon: settings.icon.map(Icon::into),
platform_specific: iced_winit::settings::PlatformSpecific::from(
settings.platform_specific,
),
platform_specific: settings.platform_specific,
}
}
}
20 changes: 0 additions & 20 deletions src/window/settings/macos.rs

This file was deleted.

9 changes: 0 additions & 9 deletions src/window/settings/other.rs

This file was deleted.

0 comments on commit 4405a3d

Please sign in to comment.