leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup.

Browse source
This commit is contained in:
Mark Tomlin 2024-01-14 00:16:15 -05:00 • committed by Jeremy Soller
parent 3233ed8ceb
commit 677c924323
2 changed files with 105 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main.rs
View file

@ -445,7 +445,6 @@ impl App {
} }
fn save_config(&mut self) -> Command<Message> { fn save_config(&mut self) -> Command<Message> {
if let Some(ref config_handler) = self.config_handler { if let Some(ref config_handler) = self.config_handler {
if let Err(err) = self.config.write_entry(config_handler) { if let Err(err) = self.config.write_entry(config_handler) {
log::error!("failed to save config: {}", err); log::error!("failed to save config: {}", err);
@ -1667,9 +1666,8 @@ impl Application for App {
self.set_context_title(context_page.title()); self.set_context_title(context_page.title());
// Execute commands for specific pages // Execute commands for specific pages
if self.core.window.show_context { if self.core.window.show_context && self.context_page == ContextPage::GitManagement
match self.context_page { {
ContextPage::GitManagement => {
self.git_project_status = None; self.git_project_status = None;
let projects = self.projects.clone(); let projects = self.projects.clone();
return Command::perform( return Command::perform(
@ -1710,9 +1708,6 @@ impl Application for App {
|x| x, |x| x,
); );
} }
_ => {}
}
}
// Ensure focus of correct input // Ensure focus of correct input
return self.update_focus(); return self.update_focus();

20
src/text_box.rs
View file

@ -608,17 +608,14 @@ where
Point::new(image_position.x + scrollbar_rect.x, image_position.y), Point::new(image_position.x + scrollbar_rect.x, image_position.y),
Size::new(scrollbar_rect.width, layout.bounds().height), Size::new(scrollbar_rect.width, layout.bounds().height),
), ),
border_radius: (scrollbar_rect.width as f32 / 2.0).into(), border_radius: (scrollbar_rect.width / 2.0).into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
Color::from(track_color), Color::from(track_color),
); );
let pressed = match &state.dragging { let pressed = matches!(&state.dragging, Some(Dragging::Scrollbar { .. }));
Some(Dragging::Scrollbar { .. }) => true,
_ => false,
};
let mut hover = false; let mut hover = false;
if let Some(p) = cursor_position.position_in(layout.bounds()) { if let Some(p) = cursor_position.position_in(layout.bounds()) {
@ -668,7 +665,7 @@ where
renderer.fill_quad( renderer.fill_quad(
Quad { Quad {
bounds: scrollbar_draw, bounds: scrollbar_draw,
border_radius: (scrollbar_draw.width as f32 / 2.0).into(), border_radius: (scrollbar_draw.width / 2.0).into(),
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
@ -706,8 +703,7 @@ where
Event::Keyboard(KeyEvent::KeyPressed { Event::Keyboard(KeyEvent::KeyPressed {
key_code, key_code,
modifiers, modifiers,
}) if state.is_focused => { }) if state.is_focused => match key_code {
match key_code {
KeyCode::Left => { KeyCode::Left => {
editor.action(Action::Motion(Motion::Left)); editor.action(Action::Motion(Motion::Left));
status = Status::Captured; status = Status::Captured;
@ -765,17 +761,13 @@ where
status = Status::Captured; status = Status::Captured;
} }
_ => (), _ => (),
} },
}
Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => { Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => {
state.modifiers = modifiers; state.modifiers = modifiers;
} }
Event::Keyboard(KeyEvent::CharacterReceived(character)) if state.is_focused => { Event::Keyboard(KeyEvent::CharacterReceived(character)) if state.is_focused => {
// Only parse keys when Super, Ctrl, and Alt are not pressed // Only parse keys when Super, Ctrl, and Alt are not pressed
if !state.modifiers.logo() if !state.modifiers.logo() && !state.modifiers.control() && !state.modifiers.alt() {
&& !state.modifiers.control()
&& !state.modifiers.alt()
{
if !character.is_control() { if !character.is_control() {
editor.action(Action::Insert(character)); editor.action(Action::Insert(character));
} }