Skip to content

feat: add Undo action variant and actions-on-double-click #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
clansty wants to merge 1 commit into from
Closed

feat: add Undo action variant and actions-on-double-click #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,13 @@ Options:
--auto-copy
Automatically copy to clipboard after every annotation change (NEXTRELEASE)
--actions-on-enter <ACTIONS_ON_ENTER>
Actions to perform when pressing Enter [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit]
Actions to perform when pressing Enter [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit, undo]
--actions-on-escape <ACTIONS_ON_ESCAPE>
Actions to perform when pressing Escape [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit]
Actions to perform when pressing Escape [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit, undo]
--actions-on-right-click <ACTIONS_ON_RIGHT_CLICK>
Actions to perform when hitting the copy Button [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit]
Actions to perform when hitting the copy Button [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit, undo]
--actions-on-double-click <ACTIONS_ON_DOUBLE_CLICK>
Actions to perform on double-click (NEXTRELEASE) [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit, undo]
-d, --default-hide-toolbars
Hide toolbars by default
--focus-toggles-toolbars
Expand Down Expand Up @@ -316,7 +318,7 @@ Options:
--right-click-copy
Right click to copy. Preferably use the `action_on_right_click` option instead
--action-on-enter <ACTION_ON_ENTER>
Action to perform when pressing Enter. Preferably use the `actions_on_enter` option instead [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit]
Action to perform when pressing Enter. Preferably use the `actions_on_enter` option instead [possible values: save-to-clipboard, save-to-file, save-to-file-as, copy-filepath-to-clipboard, exit, undo]
-h, --help
Print help
-V, --version
Expand Down
5 changes: 5 additions & 0 deletions cli/src/command_line.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ pub struct CommandLine {
#[arg(long, value_delimiter = ',')]
pub actions_on_right_click: Option<Vec<Action>>,

/// Actions to perform on double-click (NEXTRELEASE)
#[arg(long, value_delimiter = ',')]
pub actions_on_double_click: Option<Vec<Action>>,

/// Hide toolbars by default
#[arg(short, long)]
pub default_hide_toolbars: bool,
Expand Down Expand Up @@ -232,6 +236,7 @@ pub enum Action {
SaveToFileAs,
CopyFilepathToClipboard,
Exit,
Undo,
}

#[derive(Debug, Clone, Copy, Default, ValueEnum)]
Expand Down
15 changes: 15 additions & 0 deletions src/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ pub struct Configuration {
actions_on_enter: Vec<Action>,
actions_on_escape: Vec<Action>,
actions_on_right_click: Vec<Action>,
actions_on_double_click: Vec<Action>,
color_palette: ColorPalette,
default_hide_toolbars: bool,
focus_toggles_toolbars: bool,
Expand Down Expand Up @@ -232,6 +233,7 @@ pub enum Action {
SaveToFileAs,
CopyFilepathToClipboard,
Exit,
Undo,
}

impl From<CommandLineAction> for Action {
Expand All @@ -242,6 +244,7 @@ impl From<CommandLineAction> for Action {
CommandLineAction::SaveToFileAs => Self::SaveToFileAs,
CommandLineAction::CopyFilepathToClipboard => Self::CopyFilepathToClipboard,
CommandLineAction::Exit => Self::Exit,
CommandLineAction::Undo => Self::Undo,
}
}
}
Expand Down Expand Up @@ -321,6 +324,9 @@ impl Configuration {
if let Some(v) = general.actions_on_right_click {
self.actions_on_right_click = v;
}
if let Some(v) = general.actions_on_double_click {
self.actions_on_double_click = v;
}
if let Some(v) = general.default_hide_toolbars {
self.default_hide_toolbars = v;
}
Expand Down Expand Up @@ -457,6 +463,9 @@ impl Configuration {
if let Some(v) = command_line.actions_on_right_click {
self.actions_on_right_click = v.iter().cloned().map(Into::into).collect();
}
if let Some(v) = command_line.actions_on_double_click {
self.actions_on_double_click = v.iter().cloned().map(Into::into).collect();
}
if let Some(v) = command_line.font_family {
self.font.family = Some(v);
}
Expand Down Expand Up @@ -587,6 +596,10 @@ impl Configuration {
self.actions_on_right_click.clone()
}

pub fn actions_on_double_click(&self) -> Vec<Action> {
self.actions_on_double_click.clone()
}

pub fn color_palette(&self) -> &ColorPalette {
&self.color_palette
}
Expand Down Expand Up @@ -677,6 +690,7 @@ impl Default for Configuration {
actions_on_enter: vec![],
actions_on_escape: vec![Action::Exit],
actions_on_right_click: vec![],
actions_on_double_click: vec![],
color_palette: ColorPalette::default(),
default_hide_toolbars: false,
focus_toggles_toolbars: false,
Expand Down Expand Up @@ -765,6 +779,7 @@ struct ConfigurationFileGeneral {
actions_on_enter: Option<Vec<Action>>,
actions_on_escape: Option<Vec<Action>>,
actions_on_right_click: Option<Vec<Action>>,
actions_on_double_click: Option<Vec<Action>>,
default_hide_toolbars: Option<bool>,
focus_toggles_toolbars: Option<bool>,
default_fill_shapes: Option<bool>,
Expand Down
52 changes: 45 additions & 7 deletions src/sketch_board.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,9 @@ impl InputEvent {
if let InputEvent::Mouse(me) = self {
match me.type_ {
MouseEventType::Click => {
if me.button == MouseButton::Secondary {
renderer.request_render(&APP_CONFIG.read().actions_on_right_click());
None
} else {
None
}
// Right-click and double-click are handled in update() where
// we have access to handle_undo() and full SketchBoard state.
None
}
MouseEventType::EndDrag | MouseEventType::UpdateDrag => {
if me.button == MouseButton::Middle {
Expand Down Expand Up @@ -285,6 +282,25 @@ impl SketchBoard {
rv
}

fn process_actions(&mut self, actions: &[Action]) -> ToolUpdateResult {
let mut render_actions = Vec::new();
for action in actions {
match action {
Action::Undo => {
if !matches!(self.handle_undo(), ToolUpdateResult::Unmodified) {
return ToolUpdateResult::Redraw;
}
}
other => render_actions.push(*other),
}
}
if render_actions.is_empty() {
ToolUpdateResult::Unmodified
} else {
self.handle_action(&render_actions)
}
}

fn handle_render_result_with_pixbuf(
&self,
pix_buf: Option<Pixbuf>,
Expand Down Expand Up @@ -1100,7 +1116,29 @@ impl Component for SketchBoard {
ToolUpdateResult::StopPropagation
| ToolUpdateResult::RedrawAndStopPropagation => active_tool_result,
_ => {
if let Some(result) = ie.handle_mouse_event(&self.renderer) {
if let InputEvent::Mouse(ref me) = ie {
if me.type_ == MouseEventType::Click
&& me.button == MouseButton::Secondary
{
self.process_actions(
&APP_CONFIG.read().actions_on_right_click(),
)
} else if me.type_ == MouseEventType::Click
&& me.button == MouseButton::Primary
&& me.n_pressed >= 2
{
let actions = APP_CONFIG.read().actions_on_double_click();
if actions.is_empty() {
self.process_actions(&APP_CONFIG.read().actions_on_enter())
} else {
self.process_actions(&actions)
}
} else if let Some(result) = ie.handle_mouse_event(&self.renderer) {
result
} else {
active_tool_result
}
} else if let Some(result) = ie.handle_mouse_event(&self.renderer) {
result
} else {
active_tool_result
Expand Down
Loading