use configurable default colors on reset

This commit is contained in:
dm
2021-01-21 08:54:29 +01:00
parent 3d391c571c
commit ba72cf7dc8
2 changed files with 35 additions and 23 deletions

View File

@@ -48,11 +48,20 @@ See [config/default.json](config/default.json). Set `storage_local_path` for a l
## Configure color swatches ## Configure color swatches
Add a custom array of swatches to your config/default.json. Add a custom array of swatches to your config/default.json.
**You need to include black (#000000) and transparent (rgba(0,0,0,0)) in your custom swatches palette.**
**You should include the swatch transparent (rgba(0,0,0,0)) so users can remove the color applied.**
## Configure default colors
You can define text, stroke and fill color in your config/default.json.
**You also should include the default colors in your custom swatches palette.**
```json ```json
... ...
"spacedeck": { "spacedeck": {
"default_text_color": "#E11F26",
"default_stroke_color": "#9E0F13",
"default_fill_color": "#64BCCA",
"swatches": [ "swatches": [
{"id":8, "hex":"#000000"}, {"id":8, "hex":"#000000"},
{"id":30, "hex":"rgba(0,0,0,0)"}, {"id":30, "hex":"rgba(0,0,0,0)"},
@@ -69,7 +78,6 @@ Add a custom array of swatches to your config/default.json.
{"id":41, "hex": "#E7D45A"}, {"id":41, "hex": "#E7D45A"},
{"id":42, "hex": "#ACA044"} {"id":42, "hex": "#ACA044"}
] ]
}
} }
... ...
``` ```

View File

@@ -109,6 +109,10 @@ var SpacedeckSections = {
color_picker_hue: 127, color_picker_hue: 127,
color_picker_opacity: 255, color_picker_opacity: 255,
default_text_color: ENV.options.default_text_color ? ENV.options.default_text_color : "#000000",
default_stroke_color: ENV.options.default_stroke_color ? ENV.options.default_stroke_color : "#000000",
default_fill_color: ENV.options.default_fill_color ? ENV.options.default_fill_color : "#000000",
swatches: ENV.options.swatches ? ENV.options.swatches : [ swatches: ENV.options.swatches ? ENV.options.swatches : [
{id:1, hex:"#ff00ff"}, {id:1, hex:"#ff00ff"},
{id:2, hex:"#ffff00"}, {id:2, hex:"#ffff00"},
@@ -922,10 +926,10 @@ var SpacedeckSections = {
} }
this.hide_toolbar_props(); this.hide_toolbar_props();
// reset active_style to black for new creation of artifacts // reset active_style to defaults for new creation of artifacts
this.active_style.text_color = "#000000"; this.active_style.text_color = this.default_text_color;
this.active_style.stroke_color = "#000000"; this.active_style.stroke_color = this.default_stroke_color;
this.active_style.fill_color = "#000000"; this.active_style.fill_color = this.default_fill_color;
document.getSelection().removeAllRanges(); document.getSelection().removeAllRanges();