Fixed some layer related bugs. - icy_draw - icy_draw is the successor to mystic draw. fork / mirror
HTML git clone https://git.drkhsh.at/icy_draw.git
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit f307ea9b83f56a8af43a2ff8d695f2b068876ea5
DIR parent 8df9b9847c07c3f50285493e610b7f777201bee7
HTML Author: Mike Krüger <mkrueger@posteo.de>
Date: Wed, 13 Sep 2023 20:42:38 +0200
Fixed some layer related bugs.
Diffstat:
M src/model/tools/select_imp.rs | 4 +---
M src/ui/dialogs/save_file_dialog.rs | 3 +--
M src/ui/document_docking.rs | 1 +
3 files changed, 3 insertions(+), 5 deletions(-)
---
DIR diff --git a/src/model/tools/select_imp.rs b/src/model/tools/select_imp.rs
@@ -126,7 +126,7 @@ impl Tool for SelectTool {
cur_abs: Position,
response: &egui::Response,
) -> Event {
- let cur_ch = editor.get_char(pos);
+ let cur_ch = editor.get_char_from_cur_layer(pos);
let selection_mode = if response.ctx.input(|i| i.modifiers.shift_only()) {
SelectionModifier::Add
@@ -135,7 +135,6 @@ impl Tool for SelectTool {
} else {
SelectionModifier::Replace
};
-
match self.mode {
SelectionMode::Normal => {
if button == 1 && !is_inside_selection(editor, cur_abs) {
@@ -175,7 +174,6 @@ impl Tool for SelectTool {
)
}),
}
-
Event::None
}
DIR diff --git a/src/ui/dialogs/save_file_dialog.rs b/src/ui/dialogs/save_file_dialog.rs
@@ -2,7 +2,7 @@ use eframe::egui;
use egui_file::FileDialog;
use std::path::PathBuf;
-use crate::{MainWindow, Message, Settings};
+use crate::{MainWindow, Message};
pub struct SaveFileDialog {
open_file: bool,
@@ -45,7 +45,6 @@ impl crate::ModalDialog for SaveFileDialog {
fn commit_self(&self, window: &mut MainWindow) -> crate::TerminalResult<Option<Message>> {
if let Some(file) = &self.opened_file.clone() {
if let Some(pane) = window.get_active_pane() {
- Settings::add_recent_file(file);
pane.set_path(file.clone());
pane.save();
}
DIR diff --git a/src/ui/document_docking.rs b/src/ui/document_docking.rs
@@ -46,6 +46,7 @@ impl DocumentTab {
log::error!("No document to save");
return None;
};
+ Settings::add_recent_file(path);
let mut msg = None;
match doc.get_bytes(path) {