last speck of dust
This commit is contained in:
Penwing
parent
4320990497
commit
0c466a322e
|
|
@ -303,11 +303,8 @@ impl CodeEditor {
|
|||
{
|
||||
if let Some(range) = last_cursor {
|
||||
if range.primary.index != range.secondary.index {
|
||||
(*text, extend) = self.add_start_of_line(
|
||||
*range,
|
||||
previous_text.clone(),
|
||||
"\t",
|
||||
);
|
||||
(*text, extend) =
|
||||
self.add_start_of_line(*range, previous_text.clone(), "\t");
|
||||
get_new_cursor = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -337,8 +334,7 @@ impl CodeEditor {
|
|||
} else if let Some(cursor_range) = *last_cursor {
|
||||
let mut start =
|
||||
min(cursor_range.primary.index, cursor_range.secondary.index);
|
||||
let end =
|
||||
max(cursor_range.primary.index, cursor_range.secondary.index);
|
||||
let end = max(cursor_range.primary.index, cursor_range.secondary.index);
|
||||
let extended = match end as isize + extend {
|
||||
// Check for overflow or negative result
|
||||
value if value < 0 => 0,
|
||||
|
|
|
|||
323
src/main.rs
323
src/main.rs
|
|
@ -12,14 +12,14 @@ use calcifer::code_editor::themes::DEFAULT_THEMES;
|
|||
|
||||
#[cfg(debug_assertions)]
|
||||
mod build {
|
||||
pub const SAVE_PATH: &str = "/home/penwing/Documents/.save/debug/calcifer_save.json";
|
||||
pub const TITLE: &str = " debug";
|
||||
pub const SAVE_PATH: &str = "/home/penwing/Documents/.save/debug/calcifer_save.json";
|
||||
pub const TITLE: &str = " debug";
|
||||
}
|
||||
|
||||
#[cfg(not(debug_assertions))]
|
||||
mod build {
|
||||
pub const SAVE_PATH: &str = "/home/penwing/Documents/.save/calcifer_save.json";
|
||||
pub const TITLE: &str = "";
|
||||
pub const SAVE_PATH: &str = "/home/penwing/Documents/.save/calcifer_save.json";
|
||||
pub const TITLE: &str = "";
|
||||
}
|
||||
|
||||
use build::SAVE_PATH;
|
||||
|
|
@ -29,7 +29,7 @@ const TERMINAL_HEIGHT: f32 = 200.0;
|
|||
const TERMINAL_RANGE: Range<f32> = 100.0..500.0;
|
||||
const RED: egui::Color32 = egui::Color32::from_rgb(235, 108, 99);
|
||||
const TIME_LABELS: [&str; 7] = [
|
||||
"input", "settings", "tree", "terminal", "tabs", "content", "windows",
|
||||
"input", "settings", "tree", "terminal", "tabs", "content", "windows",
|
||||
];
|
||||
const MAX_FPS: f32 = 30.0;
|
||||
const PATH_ROOT: &str = "/home/penwing/Documents/";
|
||||
|
|
@ -37,207 +37,210 @@ const DISPLAY_PATH_DEPTH: usize = 3;
|
|||
const MAX_TABS: usize = 20;
|
||||
|
||||
fn main() -> Result<(), eframe::Error> {
|
||||
let icon_data = tools::load_icon();
|
||||
let options = eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
.with_inner_size([1200.0, 800.0])
|
||||
.with_icon(Arc::new(icon_data)),
|
||||
..Default::default()
|
||||
};
|
||||
let icon_data = tools::load_icon();
|
||||
let options = eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
.with_inner_size([1200.0, 800.0])
|
||||
.with_icon(Arc::new(icon_data)),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
// Attempt to load previous state
|
||||
let app_state: tools::AppState = if Path::new(SAVE_PATH).exists() {
|
||||
tools::load_state(SAVE_PATH).expect("Failed to load the save")
|
||||
} else {
|
||||
tools::AppState {tabs: vec![], theme: 0,}
|
||||
};
|
||||
// Attempt to load previous state
|
||||
let app_state: tools::AppState = if Path::new(SAVE_PATH).exists() {
|
||||
tools::load_state(SAVE_PATH).expect("Failed to load the save")
|
||||
} else {
|
||||
tools::AppState {
|
||||
tabs: vec![],
|
||||
theme: 0,
|
||||
}
|
||||
};
|
||||
|
||||
eframe::run_native(
|
||||
&format!("Calcifer{}{}", tools::version(), TITLE),
|
||||
options,
|
||||
Box::new(move |_cc| Box::from(Calcifer::from_app_state(app_state))),
|
||||
)
|
||||
eframe::run_native(
|
||||
&format!("Calcifer{}{}", tools::version(), TITLE),
|
||||
options,
|
||||
Box::new(move |_cc| Box::from(Calcifer::from_app_state(app_state))),
|
||||
)
|
||||
}
|
||||
|
||||
struct Calcifer {
|
||||
selected_tab: tools::TabNumber,
|
||||
tabs: Vec<tools::Tab>,
|
||||
selected_tab: tools::TabNumber,
|
||||
tabs: Vec<tools::Tab>,
|
||||
|
||||
command: String,
|
||||
command_history: Vec<tools::CommandEntry>,
|
||||
command: String,
|
||||
command_history: Vec<tools::CommandEntry>,
|
||||
|
||||
theme: ColorTheme,
|
||||
font_size: f32,
|
||||
theme: ColorTheme,
|
||||
font_size: f32,
|
||||
|
||||
tree_visible: bool,
|
||||
profiler_visible: bool,
|
||||
terminal_visible: bool,
|
||||
tree_visible: bool,
|
||||
profiler_visible: bool,
|
||||
terminal_visible: bool,
|
||||
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow,
|
||||
tab_to_close: usize,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow,
|
||||
exit_confirm: tools::confirm::ConfirmWindow,
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow,
|
||||
tab_to_close: usize,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow,
|
||||
exit_confirm: tools::confirm::ConfirmWindow,
|
||||
|
||||
search_menu: tools::search::SearchWindow,
|
||||
settings_menu: tools::settings::SettingsWindow,
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow,
|
||||
search_menu: tools::search::SearchWindow,
|
||||
settings_menu: tools::settings::SettingsWindow,
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow,
|
||||
|
||||
time_watch: Vec<f32>,
|
||||
next_frame: time::Instant,
|
||||
time_watch: Vec<f32>,
|
||||
next_frame: time::Instant,
|
||||
}
|
||||
|
||||
impl Default for Calcifer {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
selected_tab: tools::TabNumber::from_index(0),
|
||||
tabs: vec![tools::Tab::default()],
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
selected_tab: tools::TabNumber::from_index(0),
|
||||
tabs: vec![tools::Tab::default()],
|
||||
|
||||
command: String::new(),
|
||||
command_history: Vec::new(),
|
||||
command: String::new(),
|
||||
command_history: Vec::new(),
|
||||
|
||||
theme: DEFAULT_THEMES[0],
|
||||
font_size: 14.0,
|
||||
theme: DEFAULT_THEMES[0],
|
||||
font_size: 14.0,
|
||||
|
||||
tree_visible: false,
|
||||
profiler_visible: false,
|
||||
terminal_visible: false,
|
||||
tree_visible: false,
|
||||
profiler_visible: false,
|
||||
terminal_visible: false,
|
||||
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to close this document ?",
|
||||
"Confirm Close",
|
||||
),
|
||||
tab_to_close: 0,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to refresh this document ?",
|
||||
"Confirm Refresh",
|
||||
),
|
||||
exit_confirm: tools::confirm::ConfirmWindow::new("", "Confirm Exit"),
|
||||
close_tab_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to close this document ?",
|
||||
"Confirm Close",
|
||||
),
|
||||
tab_to_close: 0,
|
||||
refresh_confirm: tools::confirm::ConfirmWindow::new(
|
||||
"You have some unsaved changes, Do you still want to refresh this document ?",
|
||||
"Confirm Refresh",
|
||||
),
|
||||
exit_confirm: tools::confirm::ConfirmWindow::new("", "Confirm Exit"),
|
||||
|
||||
search_menu: tools::search::SearchWindow::default(),
|
||||
settings_menu: tools::settings::SettingsWindow::new(DEFAULT_THEMES[0]),
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow::new(),
|
||||
search_menu: tools::search::SearchWindow::default(),
|
||||
settings_menu: tools::settings::SettingsWindow::new(DEFAULT_THEMES[0]),
|
||||
shortcuts_menu: tools::shortcuts::ShortcutsWindow::new(),
|
||||
|
||||
time_watch: vec![0.0; TIME_LABELS.len()],
|
||||
next_frame: time::Instant::now(),
|
||||
}
|
||||
}
|
||||
time_watch: vec![0.0; TIME_LABELS.len()],
|
||||
next_frame: time::Instant::now(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl eframe::App for Calcifer {
|
||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||
thread::sleep(time::Duration::from_secs_f32(
|
||||
((1.0 / MAX_FPS) - self.next_frame.elapsed().as_secs_f32()).max(0.0),
|
||||
));
|
||||
self.next_frame = time::Instant::now();
|
||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||
thread::sleep(time::Duration::from_secs_f32(
|
||||
((1.0 / MAX_FPS) - self.next_frame.elapsed().as_secs_f32()).max(0.0),
|
||||
));
|
||||
self.next_frame = time::Instant::now();
|
||||
|
||||
let mut watch = time::Instant::now();
|
||||
let mut watch = time::Instant::now();
|
||||
|
||||
let mut style = (*ctx.style()).clone();
|
||||
style.text_styles = [
|
||||
(Heading, FontId::new(self.font_size * 1.6, Proportional)),
|
||||
(Body, FontId::new(self.font_size, Proportional)),
|
||||
(Monospace, FontId::new(self.font_size, Proportional)),
|
||||
(Button, FontId::new(self.font_size, Proportional)),
|
||||
(Small, FontId::new(self.font_size, Proportional)),
|
||||
]
|
||||
.into();
|
||||
ctx.set_style(style);
|
||||
let mut style = (*ctx.style()).clone();
|
||||
style.text_styles = [
|
||||
(Heading, FontId::new(self.font_size * 1.6, Proportional)),
|
||||
(Body, FontId::new(self.font_size, Proportional)),
|
||||
(Monospace, FontId::new(self.font_size, Proportional)),
|
||||
(Button, FontId::new(self.font_size, Proportional)),
|
||||
(Small, FontId::new(self.font_size, Proportional)),
|
||||
]
|
||||
.into();
|
||||
ctx.set_style(style);
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::R) && i.modifiers.ctrl)
|
||||
&& !self.refresh_confirm.visible
|
||||
{
|
||||
if self.tabs[self.selected_tab.to_index()].saved {
|
||||
self.tabs[self.selected_tab.to_index()].refresh();
|
||||
} else {
|
||||
self.refresh_confirm.ask();
|
||||
}
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::R) && i.modifiers.ctrl)
|
||||
&& !self.refresh_confirm.visible
|
||||
{
|
||||
if self.tabs[self.selected_tab.to_index()].saved {
|
||||
self.tabs[self.selected_tab.to_index()].refresh();
|
||||
} else {
|
||||
self.refresh_confirm.ask();
|
||||
}
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl) {
|
||||
self.handle_save_file(self.save_tab());
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl) {
|
||||
self.handle_save_file(self.save_tab());
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl && i.modifiers.shift) {
|
||||
self.handle_save_file(self.save_tab_as());
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::S) && i.modifiers.ctrl && i.modifiers.shift) {
|
||||
self.handle_save_file(self.save_tab_as());
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowLeft) && i.modifiers.alt) {
|
||||
self.move_through_tabs(false);
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowLeft) && i.modifiers.alt) {
|
||||
self.move_through_tabs(false);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowRight) && i.modifiers.alt) {
|
||||
self.move_through_tabs(true);
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::ArrowRight) && i.modifiers.alt) {
|
||||
self.move_through_tabs(true);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.zoom_delta() > 1.0) {
|
||||
self.font_size = (self.font_size * 1.1).min(30.0);
|
||||
}
|
||||
if ctx.input(|i| i.zoom_delta() > 1.0) {
|
||||
self.font_size = (self.font_size * 1.1).min(30.0);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.zoom_delta() < 1.0) {
|
||||
self.font_size = (self.font_size / 1.1).max(10.0);
|
||||
}
|
||||
if ctx.input(|i| i.zoom_delta() < 1.0) {
|
||||
self.font_size = (self.font_size / 1.1).max(10.0);
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::F) && i.modifiers.ctrl) {
|
||||
self.search_menu.visible = !self.search_menu.visible;
|
||||
self.search_menu.initialized = !self.search_menu.visible;
|
||||
}
|
||||
if ctx.input(|i| i.key_pressed(egui::Key::F) && i.modifiers.ctrl) {
|
||||
self.search_menu.visible = !self.search_menu.visible;
|
||||
self.search_menu.initialized = !self.search_menu.visible;
|
||||
}
|
||||
|
||||
if ctx.input(|i| i.viewport().close_requested()) {
|
||||
let mut unsaved_tabs: Vec<usize> = vec![];
|
||||
for (index, tab) in self.tabs.iter().enumerate() {
|
||||
if !tab.saved {
|
||||
unsaved_tabs.push(index);
|
||||
}
|
||||
}
|
||||
if !unsaved_tabs.is_empty() {
|
||||
let mut unsaved_tabs_names: String = "".to_string();
|
||||
for index in unsaved_tabs.iter() {
|
||||
unsaved_tabs_names.push_str(&self.tabs[*index].get_name());
|
||||
}
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::CancelClose);
|
||||
self.exit_confirm.prompt = format!(
|
||||
"You have some unsaved changes :\n{}\nDo you still want to exit ?",
|
||||
unsaved_tabs_names
|
||||
);
|
||||
self.exit_confirm.ask();
|
||||
}
|
||||
}
|
||||
if ctx.input(|i| i.viewport().close_requested()) {
|
||||
let mut unsaved_tabs: Vec<usize> = vec![];
|
||||
for (index, tab) in self.tabs.iter().enumerate() {
|
||||
if !tab.saved {
|
||||
unsaved_tabs.push(index);
|
||||
}
|
||||
}
|
||||
if !unsaved_tabs.is_empty() {
|
||||
let mut unsaved_tabs_names: String = "".to_string();
|
||||
for index in unsaved_tabs.iter() {
|
||||
unsaved_tabs_names.push_str(&self.tabs[*index].get_name());
|
||||
}
|
||||
egui::Context::send_viewport_cmd(ctx, egui::ViewportCommand::CancelClose);
|
||||
self.exit_confirm.prompt = format!(
|
||||
"You have some unsaved changes :\n{}\nDo you still want to exit ?",
|
||||
unsaved_tabs_names
|
||||
);
|
||||
self.exit_confirm.ask();
|
||||
}
|
||||
}
|
||||
|
||||
self.time_watch[0] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[0] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_settings(ctx);
|
||||
self.draw_settings(ctx);
|
||||
|
||||
self.time_watch[1] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[1] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_tree_panel(ctx);
|
||||
self.draw_tree_panel(ctx);
|
||||
|
||||
self.time_watch[2] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[2] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_bottom_tray(ctx);
|
||||
self.draw_terminal_panel(ctx);
|
||||
self.draw_bottom_tray(ctx);
|
||||
self.draw_terminal_panel(ctx);
|
||||
|
||||
self.time_watch[3] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[3] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_tab_panel(ctx);
|
||||
self.draw_tab_panel(ctx);
|
||||
|
||||
self.time_watch[4] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[4] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
self.draw_content_panel(ctx);
|
||||
self.draw_content_panel(ctx);
|
||||
|
||||
self.time_watch[5] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
self.time_watch[5] = watch.elapsed().as_micros() as f32 / 1000.0;
|
||||
watch = time::Instant::now();
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
fn on_exit(&mut self, _gl: std::option::Option<&eframe::glow::Context>) {
|
||||
self.save_state();
|
||||
}
|
||||
fn on_exit(&mut self, _gl: std::option::Option<&eframe::glow::Context>) {
|
||||
self.save_state();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue