zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Expose titlebar_height in LayoutContext

Browse Source
This commit is contained in:
Nathan Sobo 2021-08-06 09:11:16 -06:00
parent e16c62ed0e
commit 149fb574c7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gpui/src/app.rs
View File

@ -1041,6 +1041,7 @@ impl MutableAppContext {
app.update(|cx| {
let scene = presenter.borrow_mut().build_scene(
window.size(),
window.titlebar_height(),
window.scale_factor(),
cx,
);
@ -1197,7 +1198,12 @@ impl MutableAppContext {
{
let mut presenter = presenter.borrow_mut();
presenter.invalidate(invalidation, self.as_ref());
let scene = presenter.build_scene(window.size(), window.scale_factor(), self);
let scene = presenter.build_scene(
window.size(),
window.titlebar_height(),
window.scale_factor(),
self,
);
window.present_scene(scene);
}
self.presenters_and_platform_windows

7
gpui/src/presenter.rs
View File

@ -70,13 +70,14 @@ impl Presenter {
pub fn build_scene(
&mut self,
window_size: Vector2F,
titlebar_height: f32,
scale_factor: f32,
cx: &mut MutableAppContext,
) -> Scene {
let mut scene = Scene::new(scale_factor);
if let Some(root_view_id) = cx.root_view_id(self.window_id) {
self.layout(window_size, cx);
self.layout(window_size, titlebar_height, cx);
self.after_layout(cx);
let mut paint_cx = PaintContext {
scene: &mut scene,
@ -98,7 +99,7 @@ impl Presenter {
scene
}
fn layout(&mut self, size: Vector2F, cx: &mut MutableAppContext) {
fn layout(&mut self, size: Vector2F, titlebar_height: f32, cx: &mut MutableAppContext) {
if let Some(root_view_id) = cx.root_view_id(self.window_id) {
let mut layout_ctx = LayoutContext {
rendered_views: &mut self.rendered_views,
@ -108,6 +109,7 @@ impl Presenter {
asset_cache: &self.asset_cache,
view_stack: Vec::new(),
app: cx,
titlebar_height,
};
layout_ctx.layout(root_view_id, SizeConstraint::strict(size));
}
@ -186,6 +188,7 @@ pub struct LayoutContext<'a> {
pub asset_cache: &'a AssetCache,
pub app: &'a mut MutableAppContext,
view_stack: Vec<usize>,
pub titlebar_height: f32,
}
impl<'a> LayoutContext<'a> {