Skip to content

Commit

Permalink
Merge pull request #543 from twitchyliquid64/master
Browse files Browse the repository at this point in the history
Fixes #539: Allow windows to be set always_on_top
  • Loading branch information
hecrj authored Sep 30, 2020
2 parents 4f2962d + f2247a7 commit c393e45
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion src/window/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ pub struct Settings {
/// Whether the window should have a border, a title bar, etc. or not.
pub decorations: bool,

/// Whether the window should be transparent
/// Whether the window should be transparent.
pub transparent: bool,

/// Whether the window will always be on top of other windows.
pub always_on_top: bool,

/// The icon of the window.
pub icon: Option<Icon>,
}
Expand All @@ -34,6 +37,7 @@ impl Default for Settings {
resizable: true,
decorations: true,
transparent: false,
always_on_top: false,
icon: None,
}
}
Expand All @@ -49,6 +53,7 @@ impl From<Settings> for iced_winit::settings::Window {
resizable: settings.resizable,
decorations: settings.decorations,
transparent: settings.transparent,
always_on_top: settings.always_on_top,
icon: settings.icon.map(Icon::into),
platform_specific: Default::default(),
}
Expand Down
7 changes: 6 additions & 1 deletion winit/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ pub struct Window {
/// Whether the window should have a border, a title bar, etc.
pub decorations: bool,

/// Whether the window should be transparent
/// Whether the window should be transparent.
pub transparent: bool,

/// Whether the window will always be on top of other windows.
pub always_on_top: bool,

/// The window icon, which is also usually used in the taskbar
pub icon: Option<winit::window::Icon>,

Expand All @@ -74,6 +77,7 @@ impl Window {
.with_decorations(self.decorations)
.with_transparent(self.transparent)
.with_window_icon(self.icon)
.with_always_on_top(self.always_on_top)
.with_fullscreen(conversion::fullscreen(primary_monitor, mode));

if let Some((width, height)) = self.min_size {
Expand Down Expand Up @@ -108,6 +112,7 @@ impl Default for Window {
resizable: true,
decorations: true,
transparent: false,
always_on_top: false,
icon: None,
platform_specific: Default::default(),
}
Expand Down

0 comments on commit c393e45

Please sign in to comment.