From 9bec74f1d4cd4b147918f49d1402545b587edd28 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 22 May 2023 15:04:51 -0700 Subject: [PATCH] fmt --- crates/editor/src/editor.rs | 1 - crates/editor/src/element.rs | 1 - crates/project_panel/src/project_panel.rs | 4 ++-- crates/theme/src/theme.rs | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 57d5ec6e95ac327e187a34f09a549f57f9d9e6bc..ce67a59bd39238f819fa38d3ceb807842e664a9b 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -7253,7 +7253,6 @@ impl View for Editor { } fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext) { - dbg!("Editor Focus in"); if cx.is_self_focused() { let focused_event = EditorFocused(cx.handle()); cx.emit(Event::Focused); diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index ba9adfdd16bf7be0062aa14dd46e55207da8b2aa..13a24bfc2c1f884dc2dc1d8cc916e6fc22855ea4 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -1052,7 +1052,6 @@ impl EditorElement { ..Default::default() }); - if layout.is_singleton && settings::get::(cx).scrollbar.git_diff { let diff_style = theme::current(cx).editor.diff.clone(); for hunk in layout diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 22b6b3fd75b767a99c0a453dd531000fad4242f4..a7895172d56d02a0da84c890eafd774b9f3fa905 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -6,8 +6,8 @@ use gpui::{ actions, anyhow::{anyhow, Result}, elements::{ - AnchorCorner, ChildView, ContainerStyle, Empty, Flex, Label, - MouseEventHandler, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState, + AnchorCorner, ChildView, ContainerStyle, Empty, Flex, Label, MouseEventHandler, + ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState, }, geometry::vector::Vector2F, keymap_matcher::KeymapContext, diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index b5ac126a690ca2ba7023e526297f57302934bb4a..cd2bf90b7eb85fb51068e11c31fa7be6b0ef84ce 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -683,14 +683,14 @@ pub struct Scrollbar { pub thumb: ContainerStyle, pub width: f32, pub min_height_factor: f32, - pub git: GitDiffColors + pub git: GitDiffColors, } #[derive(Clone, Deserialize, Default)] pub struct GitDiffColors { pub inserted: Color, pub modified: Color, - pub deleted: Color + pub deleted: Color, } #[derive(Clone, Deserialize, Default)]