Bennet Bo FennerandConrad Irwin
e272acd1bc
Sharing a project displays a notification (window) on every screen. Previously there was an issue with the positioning of windows on all screens except the primary screen. As you can see here:  Now:  @mikayla-maki and I also decided to refactor the `WindowOptions` a bit. Previously you could specify bounds which controlled the positioning and size of the window in the global coordinate space, while also providing a display id (which screen to show the window on). This can lead to unusual behavior because you could theoretically specify a global bound which does not even belong to the display id which was provided. Therefore we changed the api to this: ```rust struct WindowOptions { /// The bounds of the window in screen coordinates /// None -> inherit, Some(bounds) -> set bounds. pub bounds: Option<Bounds<DevicePixels>>, /// The display to create the window on, if this is None, /// the window will be created on the main display pub display_id: Option<DisplayId>, } ``` This lets you specify a display id, which maps to the screen where the window should be created and bounds relative to the upper left of the screen. Release Notes: - Fixed positioning of popup windows (e.g. when sharing a project) when using multiple external displays. --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
131 lines
2.9 KiB
Rust
131 lines
2.9 KiB
Rust
//! Macos screen have a y axis that goings up from the bottom of the screen and
|
|
//! an origin at the bottom left of the main display.
|
|
mod dispatcher;
|
|
mod display;
|
|
mod display_link;
|
|
mod events;
|
|
|
|
#[cfg(not(feature = "macos-blade"))]
|
|
mod metal_atlas;
|
|
#[cfg(not(feature = "macos-blade"))]
|
|
pub mod metal_renderer;
|
|
|
|
#[cfg(not(feature = "macos-blade"))]
|
|
use metal_renderer as renderer;
|
|
|
|
#[cfg(feature = "macos-blade")]
|
|
use crate::platform::blade as renderer;
|
|
|
|
mod open_type;
|
|
mod platform;
|
|
mod text_system;
|
|
mod window;
|
|
mod window_appearance;
|
|
|
|
use crate::{px, size, DevicePixels, Pixels, Size};
|
|
use cocoa::{
|
|
base::{id, nil},
|
|
foundation::{NSAutoreleasePool, NSNotFound, NSRect, NSSize, NSString, NSUInteger},
|
|
};
|
|
|
|
use objc::runtime::{BOOL, NO, YES};
|
|
use std::ops::Range;
|
|
|
|
pub(crate) use dispatcher::*;
|
|
pub(crate) use display::*;
|
|
pub(crate) use display_link::*;
|
|
pub(crate) use platform::*;
|
|
pub(crate) use text_system::*;
|
|
pub(crate) use window::*;
|
|
|
|
trait BoolExt {
|
|
fn to_objc(self) -> BOOL;
|
|
}
|
|
|
|
impl BoolExt for bool {
|
|
fn to_objc(self) -> BOOL {
|
|
if self {
|
|
YES
|
|
} else {
|
|
NO
|
|
}
|
|
}
|
|
}
|
|
|
|
#[repr(C)]
|
|
#[derive(Copy, Clone, Debug)]
|
|
struct NSRange {
|
|
pub location: NSUInteger,
|
|
pub length: NSUInteger,
|
|
}
|
|
|
|
impl NSRange {
|
|
fn invalid() -> Self {
|
|
Self {
|
|
location: NSNotFound as NSUInteger,
|
|
length: 0,
|
|
}
|
|
}
|
|
|
|
fn is_valid(&self) -> bool {
|
|
self.location != NSNotFound as NSUInteger
|
|
}
|
|
|
|
fn to_range(self) -> Option<Range<usize>> {
|
|
if self.is_valid() {
|
|
let start = self.location as usize;
|
|
let end = start + self.length as usize;
|
|
Some(start..end)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<Range<usize>> for NSRange {
|
|
fn from(range: Range<usize>) -> Self {
|
|
NSRange {
|
|
location: range.start as NSUInteger,
|
|
length: range.len() as NSUInteger,
|
|
}
|
|
}
|
|
}
|
|
|
|
unsafe impl objc::Encode for NSRange {
|
|
fn encode() -> objc::Encoding {
|
|
let encoding = format!(
|
|
"{{NSRange={}{}}}",
|
|
NSUInteger::encode().as_str(),
|
|
NSUInteger::encode().as_str()
|
|
);
|
|
unsafe { objc::Encoding::from_str(&encoding) }
|
|
}
|
|
}
|
|
|
|
unsafe fn ns_string(string: &str) -> id {
|
|
NSString::alloc(nil).init_str(string).autorelease()
|
|
}
|
|
|
|
impl From<NSSize> for Size<Pixels> {
|
|
fn from(value: NSSize) -> Self {
|
|
Size {
|
|
width: px(value.width as f32),
|
|
height: px(value.height as f32),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<NSRect> for Size<Pixels> {
|
|
fn from(rect: NSRect) -> Self {
|
|
let NSSize { width, height } = rect.size;
|
|
size(width.into(), height.into())
|
|
}
|
|
}
|
|
|
|
impl From<NSRect> for Size<DevicePixels> {
|
|
fn from(rect: NSRect) -> Self {
|
|
let NSSize { width, height } = rect.size;
|
|
size(DevicePixels(width as i32), DevicePixels(height as i32))
|
|
}
|
|
}
|