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

fmt

Browse source
This commit is contained in:
Mikayla Maki 2023-05-22 15:04:51 -07:00
parent 9a47415cb5
commit 9bec74f1d4
No known key found for this signature in database
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/editor/src/editor.rs
View file

@ -7253,7 +7253,6 @@ impl View for Editor {
} }
fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
dbg!("Editor Focus in");
if cx.is_self_focused() { if cx.is_self_focused() {
let focused_event = EditorFocused(cx.handle()); let focused_event = EditorFocused(cx.handle());
cx.emit(Event::Focused); cx.emit(Event::Focused);

1
crates/editor/src/element.rs
View file

@ -1052,7 +1052,6 @@ impl EditorElement {
..Default::default() ..Default::default()
}); });
if layout.is_singleton && settings::get::<EditorSettings>(cx).scrollbar.git_diff { if layout.is_singleton && settings::get::<EditorSettings>(cx).scrollbar.git_diff {
let diff_style = theme::current(cx).editor.diff.clone(); let diff_style = theme::current(cx).editor.diff.clone();
for hunk in layout for hunk in layout

4
crates/project_panel/src/project_panel.rs
View file

@ -6,8 +6,8 @@ use gpui::{
actions, actions,
anyhow::{anyhow, Result}, anyhow::{anyhow, Result},
elements::{ elements::{
AnchorCorner, ChildView, ContainerStyle, Empty, Flex, Label, AnchorCorner, ChildView, ContainerStyle, Empty, Flex, Label, MouseEventHandler,
MouseEventHandler, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState,
}, },
geometry::vector::Vector2F, geometry::vector::Vector2F,
keymap_matcher::KeymapContext, keymap_matcher::KeymapContext,

4
crates/theme/src/theme.rs
View file

@ -683,14 +683,14 @@ pub struct Scrollbar {
pub thumb: ContainerStyle, pub thumb: ContainerStyle,
pub width: f32, pub width: f32,
pub min_height_factor: f32, pub min_height_factor: f32,
pub git: GitDiffColors pub git: GitDiffColors,
} }
#[derive(Clone, Deserialize, Default)] #[derive(Clone, Deserialize, Default)]
pub struct GitDiffColors { pub struct GitDiffColors {
pub inserted: Color, pub inserted: Color,
pub modified: Color, pub modified: Color,
pub deleted: Color pub deleted: Color,
} }
#[derive(Clone, Deserialize, Default)] #[derive(Clone, Deserialize, Default)]