feat: add Window::is_resizable (#2171)

* feat: add `Window::is_resizable`

* move it right after `set_resizable`
This commit is contained in:
Amr Bashir 2022-02-17 17:03:17 +02:00 committed by GitHub
parent fa14863284
commit daf0d6b9a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 52 additions and 0 deletions

View file

@ -8,6 +8,7 @@ And please only add new entries to the top of this list, right below the `# Unre
# Unreleased
- Added `Window::is_resizable`.
- Added `Window::is_decorated`.
- On X11, fix for repeated event loop iteration when `ControlFlow` was `Wait`
- On Wayland, report unaccelerated mouse deltas in `DeviceEvent::MouseMotion`.

View file

@ -543,6 +543,10 @@ impl Window {
pub fn set_resizable(&self, _resizeable: bool) {}
pub fn is_resizable(&self) -> bool {
false
}
pub fn set_minimized(&self, _minimized: bool) {}
pub fn set_maximized(&self, _maximized: bool) {}

View file

@ -159,6 +159,11 @@ impl Inner {
warn!("`Window::set_resizable` is ignored on iOS")
}
pub fn is_resizable(&self) -> bool {
warn!("`Window::is_resizable` is ignored on iOS");
false
}
pub fn scale_factor(&self) -> f64 {
unsafe {
let hidpi: CGFloat = msg_send![self.view, contentScaleFactor];

View file

@ -366,6 +366,11 @@ impl Window {
x11_or_wayland!(match self; Window(w) => w.set_resizable(resizable))
}
#[inline]
pub fn is_resizable(&self) -> bool {
x11_or_wayland!(match self; Window(w) => w.is_resizable())
}
#[inline]
pub fn set_cursor_icon(&self, cursor: CursorIcon) {
x11_or_wayland!(match self; Window(w) => w.set_cursor_icon(cursor))

View file

@ -336,6 +336,11 @@ impl Window {
self.send_request(WindowRequest::Resizeable(resizable));
}
#[inline]
pub fn is_resizable(&self) -> bool {
true
}
#[inline]
pub fn scale_factor(&self) -> u32 {
// The scale factor from `get_surface_scale_factor` is always greater than zero, so

View file

@ -1211,6 +1211,11 @@ impl UnownedWindow {
.expect("Failed to call `XSetWMNormalHints`");
}
#[inline]
pub fn is_resizable(&self) -> bool {
true
}
#[inline]
pub fn xlib_display(&self) -> *mut c_void {
self.xconn.display as _

View file

@ -602,6 +602,12 @@ impl UnownedWindow {
} // Otherwise, we don't change the mask until we exit fullscreen.
}
#[inline]
pub fn is_resizable(&self) -> bool {
let is_resizable: BOOL = unsafe { msg_send![*self.ns_window, isResizable] };
is_resizable == YES
}
pub fn set_cursor_icon(&self, cursor: CursorIcon) {
let cursor = util::Cursor::from(cursor);
if let Some(cursor_access) = self.cursor_state.upgrade() {

View file

@ -151,6 +151,10 @@ impl Window {
// Intentionally a no-op: users can't resize canvas elements
}
pub fn is_resizable(&self) -> bool {
true
}
#[inline]
pub fn scale_factor(&self) -> f64 {
super::backend::scale_factor()

View file

@ -225,6 +225,12 @@ impl Window {
});
}
#[inline]
pub fn is_resizable(&self) -> bool {
let window_state = self.window_state.lock();
window_state.window_flags.contains(WindowFlags::RESIZABLE)
}
/// Returns the `hwnd` of this window.
#[inline]
pub fn hwnd(&self) -> HWND {

View file

@ -669,6 +669,17 @@ impl Window {
self.window.set_resizable(resizable)
}
/// Gets the window's current resizable state.
///
/// ## Platform-specific
///
/// - **Wayland / X11:** Not implemented.
/// - **iOS / Android / Web:** Unsupported.
#[inline]
pub fn is_resizable(&self) -> bool {
self.window.is_resizable()
}
/// Sets the window to minimized or back
///
/// ## Platform-specific