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

fix formatting

Browse source
This commit is contained in:
Keith Simmons 2022-03-10 01:09:25 -08:00
parent 178442a4a8
commit 0d42c85195
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1023,10 +1023,7 @@ impl Editor {
cx.notify(); cx.notify();
} }
pub fn set_cursor_shape( pub fn set_cursor_shape(&mut self, cursor_shape: CursorShape) {
&mut self,
cursor_shape: CursorShape
) {
self.cursor_shape = cursor_shape; self.cursor_shape = cursor_shape;
// TODO: Do we need to notify? // TODO: Do we need to notify?
} }

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

@ -36,8 +36,16 @@ pub struct EditorElement {
} }
impl EditorElement { impl EditorElement {
pub fn new(view: WeakViewHandle<Editor>, style: EditorStyle, cursor_shape: CursorShape) -> Self { pub fn new(
Self { view, style, cursor_shape } view: WeakViewHandle<Editor>,
style: EditorStyle,
cursor_shape: CursorShape,
) -> Self {
Self {
view,
style,
cursor_shape,
}
} }
fn view<'a>(&self, cx: &'a AppContext) -> &'a Editor { fn view<'a>(&self, cx: &'a AppContext) -> &'a Editor {
@ -365,7 +373,8 @@ impl EditorElement {
&layout.line_layouts[(cursor_position.row() - start_row) as usize]; &layout.line_layouts[(cursor_position.row() - start_row) as usize];
let cursor_column = cursor_position.column() as usize; let cursor_column = cursor_position.column() as usize;
let cursor_character_x = cursor_row_layout.x_for_index(cursor_column); let cursor_character_x = cursor_row_layout.x_for_index(cursor_column);
let mut character_width = cursor_row_layout.x_for_index(cursor_column + 1) - cursor_character_x; let mut character_width =
cursor_row_layout.x_for_index(cursor_column + 1) - cursor_character_x;
// TODO: Is there a better option here for the character size // TODO: Is there a better option here for the character size
// at the end of the line? // at the end of the line?
// Default to 1/3 the line height // Default to 1/3 the line height
@ -1228,7 +1237,7 @@ impl PaintState {
pub enum CursorShape { pub enum CursorShape {
Bar, Bar,
Block, Block,
Underscore Underscore,
} }
impl Default for CursorShape { impl Default for CursorShape {
@ -1242,17 +1251,20 @@ struct Cursor {
character_width: f32, character_width: f32,
line_height: f32, line_height: f32,
color: Color, color: Color,
shape: CursorShape shape: CursorShape,
} }
impl Cursor { impl Cursor {
fn paint(&self, cx: &mut PaintContext) { fn paint(&self, cx: &mut PaintContext) {
let bounds = match self.shape { let bounds = match self.shape {
CursorShape::Bar => RectF::new(self.origin, vec2f(2.0, self.line_height)), CursorShape::Bar => RectF::new(self.origin, vec2f(2.0, self.line_height)),
CursorShape::Block => RectF::new(self.origin, vec2f(self.character_width, self.line_height)), CursorShape::Block => {
RectF::new(self.origin, vec2f(self.character_width, self.line_height))
}
CursorShape::Underscore => RectF::new( CursorShape::Underscore => RectF::new(
self.origin + Vector2F::new(0.0, self.line_height - 2.0), self.origin + Vector2F::new(0.0, self.line_height - 2.0),
vec2f(self.character_width, 2.0)), vec2f(self.character_width, 2.0),
),
}; };
cx.scene.push_quad(Quad { cx.scene.push_quad(Quad {