penwing/calcifer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

auto screen refresh when running command

Browse source
This commit is contained in:
Penwing 2024-02-02 19:01:42 +01:00
parent 95bfd219e9
commit 98662a6c3f
5 changed files with 787 additions and 768 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/ui.rs
View file

@ -44,7 +44,8 @@ impl Calcifer {
if self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION { if self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION {
ui.separator(); ui.separator();
self.project_content.item_window.visible = self.toggle(ui, self.project_content.item_window.visible, "🖊"); self.project_content.item_window.visible =
self.toggle(ui, self.project_content.item_window.visible, "🖊");
} }
}); });
}); });
@ -248,8 +249,7 @@ impl Calcifer {
}); });
ui.separator(); ui.separator();
if self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION if self.tabs[self.selected_tab.to_index()].language == PROJECT_EXTENSION {
{
self.draw_project_file(ui); self.draw_project_file(ui);
} else { } else {
self.draw_code_file(ui); self.draw_code_file(ui);
@ -293,14 +293,19 @@ impl Calcifer {
pub fn draw_windows(&mut self, ctx: &egui::Context) { pub fn draw_windows(&mut self, ctx: &egui::Context) {
if self.project_content.item_window.visible { if self.project_content.item_window.visible {
if self.project_content.categories.len() > 1 && self.project_content.categories[self.project_content.selected_item.category].content.len() > 0 { if self.project_content.categories.len() > 1
&& self.project_content.categories[self.project_content.selected_item.category]
.content
.len()
> 0
{
self.project_content.item_window.show( self.project_content.item_window.show(
ctx, ctx,
&mut self.project_content.categories[self.project_content.selected_item.category] &mut self.project_content.categories
[self.project_content.selected_item.category]
.content[self.project_content.selected_item.row], .content[self.project_content.selected_item.row],
); );
} else { } else {
self.project_content.item_window.visible = false; self.project_content.item_window.visible = false;
} }
} }

5
src/main.rs
View file

@ -264,6 +264,11 @@ impl eframe::App for Calcifer {
self.draw_windows(ctx); self.draw_windows(ctx);
self.time_watch[6] = watch.elapsed().as_micros() as f32 / 1000.0; self.time_watch[6] = watch.elapsed().as_micros() as f32 / 1000.0;
if self.running_command {
egui::Context::request_repaint(ctx);
//thread::sleep(time::Duration::from_secs_f32(RUNNING_COMMAND_REFRESH));
}
} }
fn on_exit(&mut self, _gl: std::option::Option<&eframe::glow::Context>) { fn on_exit(&mut self, _gl: std::option::Option<&eframe::glow::Context>) {

12
src/panels/project_mode.rs
View file

@ -162,7 +162,9 @@ pub fn draw_project(ui: &mut egui::Ui, theme: ColorTheme, project: &mut Project)
let category = project.selected_item.category.clone(); let category = project.selected_item.category.clone();
let row = project.selected_item.row.clone(); let row = project.selected_item.row.clone();
if ui.input(|i| i.key_pressed(egui::Key::ArrowLeft) && i.modifiers.shift) && project.selected_item.category > 0 { if ui.input(|i| i.key_pressed(egui::Key::ArrowLeft) && i.modifiers.shift)
&& project.selected_item.category > 0
{
moved = true; moved = true;
if !project.was_moving { if !project.was_moving {
let temp = project.categories[category].content[row].clone(); let temp = project.categories[category].content[row].clone();
@ -171,7 +173,9 @@ pub fn draw_project(ui: &mut egui::Ui, theme: ColorTheme, project: &mut Project)
project.selected_item.category -= 1; project.selected_item.category -= 1;
project.selected_item.row = project.categories[category - 1].content.len() - 1; project.selected_item.row = project.categories[category - 1].content.len() - 1;
} }
} else if ui.input(|i| i.key_pressed(egui::Key::ArrowRight) && i.modifiers.shift) && project.selected_item.category < project.categories.len() - 2 { } else if ui.input(|i| i.key_pressed(egui::Key::ArrowRight) && i.modifiers.shift)
&& project.selected_item.category < project.categories.len() - 2
{
moved = true; moved = true;
if !project.was_moving { if !project.was_moving {
let temp = project.categories[category].content[row].clone(); let temp = project.categories[category].content[row].clone();
@ -200,7 +204,9 @@ pub fn draw_project(ui: &mut egui::Ui, theme: ColorTheme, project: &mut Project)
project.categories[category].content[row + 1] = temp.clone(); project.categories[category].content[row + 1] = temp.clone();
project.selected_item.row += 1; project.selected_item.row += 1;
} }
} else if ui.input(|i| i.key_pressed(egui::Key::ArrowLeft)) && project.selected_item.category > 0 { } else if ui.input(|i| i.key_pressed(egui::Key::ArrowLeft))
&& project.selected_item.category > 0
{
moved = true; moved = true;
if !project.was_moving { if !project.was_moving {
project.selected_item.category -= 1; project.selected_item.category -= 1;

5
src/sub_windows/project_item.rs
View file

@ -26,6 +26,9 @@ impl ProjectItemWindow {
ui.set_min_height(250.0); ui.set_min_height(250.0);
ui.add(egui::TextEdit::singleline(&mut item.name).desired_width(f32::INFINITY)); ui.add(egui::TextEdit::singleline(&mut item.name).desired_width(f32::INFINITY));
ui.separator(); ui.separator();
ui.add_sized(ui.available_size(), egui::TextEdit::multiline(&mut item.description)); ui.add_sized(
ui.available_size(),
egui::TextEdit::multiline(&mut item.description),
);
} }
} }