Skip to content

feat: shortcuts for color setters #1361

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

feat: shortcuts for color setters #1361

Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ef0d258
feat: shortcuts for color setters
madonuko Feb 17, 2025
7b060af
fix: change set-color-* shortcuts to <Alt>1, <Alt>2, ... instead
madonuko Feb 17, 2025
715383c
refactor
madonuko Feb 17, 2025
1929b3d
fix: change set-color-* to <Ctrl><Shift>1, ... instead
madonuko Mar 16, 2025
75bd67a
fix: keypad shortcuts for color setters
madonuko Mar 17, 2025
0d132ef
chore: cargo fmt
madonuko Mar 17, 2025
e2929ed
feat: use 1~9 instead ⇒ handle Typewriter inputs correctly
madonuko Apr 6, 2025
f4c802d
fix: handle number inputs for `Editable`s
madonuko Apr 7, 2025
480e650
Merge branch 'main' into color-setters-shortcut
madonuko May 21, 2025
be08665
fix: try to make things compile
madonuko May 21, 2025
ace3365
fix: make things compile part 2
madonuko May 21, 2025
5119857
fix: cargo fmt
madonuko May 21, 2025
0ec415b
fix: move code requiring `engine_view!` into `rnote-engine`
madonuko May 21, 2025
b8e0ef7
fix: refer to `PenStyle` correctly
madonuko May 21, 2025
326bfd9
feat(shortcuts.ui): color selection entry
madonuko May 21, 2025
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
21 changes: 21 additions & 0 deletions crates/rnote-ui/src/appwindow/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,21 @@ impl RnAppWindow {
let action_active_tab_close = gio::SimpleAction::new("active-tab-close", None);
self.add_action(&action_active_tab_close);

let color_setters = {
let p = self.overlays().colorpicker();
[
[p.setter_1(), p.setter_2(), p.setter_3()],
[p.setter_4(), p.setter_5(), p.setter_6()],
[p.setter_7(), p.setter_8(), p.setter_9()],
]
.concat()
};
for (i, setter) in color_setters.into_iter().enumerate() {
let action = gio::SimpleAction::new(&format!("set-color-{}", i + 1), None);
self.add_action(&action);
action.connect_activate(move |_, _| setter.set_active(true));
}

let action_drawing_pad_pressed_button_0 =
gio::SimpleAction::new("drawing-pad-pressed-button-0", None);
self.add_action(&action_drawing_pad_pressed_button_0);
Expand Down Expand Up @@ -1171,6 +1186,12 @@ impl RnAppWindow {
app.set_accels_for_action("win.pen-style::eraser", &["<Ctrl>4", "<Ctrl>KP_4"]);
app.set_accels_for_action("win.pen-style::selector", &["<Ctrl>5", "<Ctrl>KP_5"]);
app.set_accels_for_action("win.pen-style::tools", &["<Ctrl>6", "<Ctrl>KP_6"]);
(1..=9).for_each(|i| {
app.set_accels_for_action(
&format!("win.set-color-{i}"),
&[&format!("<Ctrl><Shift>{i}"), &format!("<Alt>KP_{i}")],
)
});

// shortcuts for devel build
if config::PROFILE.to_lowercase().as_str() == "devel" {
Expand Down