diff --git a/crates/rnote-ui/data/app.gschema.xml.in b/crates/rnote-ui/data/app.gschema.xml.in index 95b8c4bdb4..1eaade44fa 100644 --- a/crates/rnote-ui/data/app.gschema.xml.in +++ b/crates/rnote-ui/data/app.gschema.xml.in @@ -42,32 +42,36 @@ the colorpicker palette color 1 (default: black) - (0.0, 0.0, 0.0, 0.0) - the colorpicker palette color 2 (default: transparent) + (1.0, 1.0, 1.0, 1.0) + the colorpicker palette color 2 (default: white) - (0.597, 0.753, 0.941, 1.0) - the colorpicker palette color 3 (default: blue 1) + (0.0, 0.0, 0.0, 0.0) + the colorpicker palette color 3 (default: transparent) - (0.101, 0.371, 0.703, 1.0) - the colorpicker palette color 4 (default: blue 5) + (0.597, 0.753, 0.941, 1.0) + the colorpicker palette color 4 (default: blue 1) - (0.148, 0.632, 0.410, 1.0) - the colorpicker palette color 5 (default: green 5) + (0.101, 0.371, 0.703, 1.0) + the colorpicker palette color 5 (default: blue 5) - (0.957, 0.757, 0.066, 1.0) - the colorpicker palette color 6 (default: yellow 4) + (0.148, 0.632, 0.410, 1.0) + the colorpicker palette color 6 (default: green 5) - (0.898, 0.378, 0.0, 1.0) - the colorpicker palette color 7 (default: orange 4) + (0.957, 0.757, 0.066, 1.0) + the colorpicker palette color 7 (default: yellow 4) + (0.898, 0.378, 0.0, 1.0) + the colorpicker palette color 8 (default: orange 4) + + (0.644, 0.113, 0.175, 1.0) - the colorpicker palette color 8 (default: red 5) + the colorpicker palette color 9 (default: red 5) 2.0 diff --git a/crates/rnote-ui/data/ui/appwindow.ui b/crates/rnote-ui/data/ui/appwindow.ui index 728a741c8f..4d1af3cb1e 100644 --- a/crates/rnote-ui/data/ui/appwindow.ui +++ b/crates/rnote-ui/data/ui/appwindow.ui @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/crates/rnote-ui/data/ui/colorpicker.ui b/crates/rnote-ui/data/ui/colorpicker.ui index 798f079663..2c6735fc7a 100644 --- a/crates/rnote-ui/data/ui/colorpicker.ui +++ b/crates/rnote-ui/data/ui/colorpicker.ui @@ -72,6 +72,10 @@ + + + + @@ -83,4 +87,4 @@ - \ No newline at end of file + diff --git a/crates/rnote-ui/src/appwindow/appsettings.rs b/crates/rnote-ui/src/appwindow/appsettings.rs index f3bcbd80f9..4d60c8817e 100644 --- a/crates/rnote-ui/src/appwindow/appsettings.rs +++ b/crates/rnote-ui/src/appwindow/appsettings.rs @@ -253,6 +253,16 @@ impl RnAppWindow { .set_mapping(gdk_color_set_mapping) .get_no_changes() .build(); + app_settings + .bind( + "colorpicker-color-9", + &self.overlays().colorpicker().setter_9(), + "color", + ) + .mapping(gdk_color_mapping) + .set_mapping(gdk_color_set_mapping) + .get_no_changes() + .build(); // brush stroke widths app_settings diff --git a/crates/rnote-ui/src/colorpicker/mod.rs b/crates/rnote-ui/src/colorpicker/mod.rs index b965294bed..483a65242b 100644 --- a/crates/rnote-ui/src/colorpicker/mod.rs +++ b/crates/rnote-ui/src/colorpicker/mod.rs @@ -53,6 +53,8 @@ mod imp { #[template_child] pub(crate) setter_8: TemplateChild, #[template_child] + pub(crate) setter_9: TemplateChild, + #[template_child] pub(crate) colordialog_button: TemplateChild