Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix or promote leftover TODOs and GPUI APIs (#12514)

Browse source 
fixes https://github.com/zed-industries/zed/issues/11966

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2024-05-31 18:36:15 -07:00 • committed by GitHub
parent a6e0c8aca1
commit 94c3101fb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 581 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/gpui/src/window.rs
View file

@ -488,7 +488,7 @@ pub struct Window {
pub(crate) handle: AnyWindowHandle,
pub(crate) removed: bool,
pub(crate) platform_window: Box<dyn PlatformWindow>,
display_id: DisplayId,
display_id: Option<DisplayId>,
sprite_atlas: Arc<dyn PlatformAtlas>,
text_system: Arc<WindowTextSystem>,
rem_size: Pixels,
@ -634,7 +634,7 @@ impl Window {
window_background,
},
);
let display_id = platform_window.display().id();
let display_id = platform_window.display().map(|display| display.id());
let sprite_atlas = platform_window.sprite_atlas();
let mouse_position = platform_window.mouse_position();
let modifiers = platform_window.modifiers();
@ -1099,7 +1099,12 @@ impl<'a> WindowContext<'a> {
fn bounds_changed(&mut self) {
self.window.scale_factor = self.window.platform_window.scale_factor();
self.window.viewport_size = self.window.platform_window.content_size();
self.window.display_id = self.window.platform_window.display().id();
self.window.display_id = self
.window
.platform_window
.display()
.map(|display| display.id());
self.refresh();
self.window
@ -1191,7 +1196,7 @@ impl<'a> WindowContext<'a> {
self.platform
.displays()
.into_iter()
.find(|display| display.id() == self.window.display_id)
.find(|display| Some(display.id()) == self.window.display_id)
}
/// Show the platform character palette.