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

Cross-platform titlebar (#9405)

Browse source 
This PR reverts https://github.com/zed-industries/zed/pull/9392 and
fixes the regressions that led to the reversion.

Release Notes:

- N/A

---------

Co-authored-by: Ezekiel Warren <ezekiel@seaube.com>
This commit is contained in:
Mikayla Maki 2024-03-15 10:40:58 -07:00 • committed by GitHub
parent 44ac6ca45c
commit 328aa2cc95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 719 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/gpui/src/platform/linux/x11/window.rs
View file

@ -31,7 +31,7 @@ use super::X11Display;
#[derive(Default)]
struct Callbacks {
request_frame: Option<Box<dyn FnMut()>>,
input: Option<Box<dyn FnMut(PlatformInput) -> bool>>,
input: Option<Box<dyn FnMut(PlatformInput) -> crate::DispatchEventResult>>,
active_status_change: Option<Box<dyn FnMut(bool)>>,
resize: Option<Box<dyn FnMut(Size<Pixels>, f32)>>,
fullscreen: Option<Box<dyn FnMut(bool)>>,
@ -303,7 +303,7 @@ impl X11WindowState {
pub fn handle_input(&self, input: PlatformInput) {
if let Some(ref mut fun) = self.callbacks.borrow_mut().input {
if fun(input.clone()) {
if !fun(input.clone()).propagate {
return;
}
}
@ -333,6 +333,11 @@ impl PlatformWindow for X11Window {
.map(|v| GlobalPixels(v as f32))
}
// todo(linux)
fn is_maximized(&self) -> bool {
false
}
fn content_size(&self) -> Size<Pixels> {
self.0.inner.borrow_mut().content_size()
}
@ -341,11 +346,6 @@ impl PlatformWindow for X11Window {
self.0.inner.borrow_mut().scale_factor
}
// todo(linux)
fn titlebar_height(&self) -> Pixels {
unimplemented!()
}
// todo(linux)
fn appearance(&self) -> WindowAppearance {
WindowAppearance::Light
@ -451,7 +451,7 @@ impl PlatformWindow for X11Window {
self.0.callbacks.borrow_mut().request_frame = Some(callback);
}
fn on_input(&self, callback: Box<dyn FnMut(PlatformInput) -> bool>) {
fn on_input(&self, callback: Box<dyn FnMut(PlatformInput) -> crate::DispatchEventResult>) {
self.0.callbacks.borrow_mut().input = Some(callback);
}