Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #539: Allow windows to be set always_on_top #543

Merged
merged 1 commit into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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