diff --git a/desktop/main.js b/desktop/main.js index c721545..544d214 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -20,7 +20,7 @@ app.on('ready', () => }) app.win.loadURL(`file://${__dirname}/sources/index.html`); - app.inspect(); + // app.inspect(); app.win.on('closed', () => { win = null diff --git a/desktop/sources/scripts/guide.js b/desktop/sources/scripts/guide.js index 03c54d5..917f9ec 100644 --- a/desktop/sources/scripts/guide.js +++ b/desktop/sources/scripts/guide.js @@ -88,12 +88,11 @@ function Guide() for (let x = dotgrid.grid_x-1; x >= 0; x--) { for (let y = dotgrid.grid_y; y >= 0; y--) { let is_step = x % dotgrid.block_x == 0 && y % dotgrid.block_y == 0; - // Color - let color = is_step ? dotgrid.theme.active.f_med : dotgrid.theme.active.f_low; - if((y == 0 || y == dotgrid.grid_y) && cursor.x == x+1){ color = dotgrid.theme.active.f_high; } - else if((x == 0 || x == dotgrid.grid_x-1) && cursor.y == y+1){ color = dotgrid.theme.active.f_high; } - else if(cursor.x == x+1 && cursor.y == y+1){ color = dotgrid.theme.active.f_high; } + let color = is_step ? dotgrid.theme.active.b_med : dotgrid.theme.active.b_low; + if((y == 0 || y == dotgrid.grid_y) && cursor.x == x+1){ color = dotgrid.theme.active.b_high; } + else if((x == 0 || x == dotgrid.grid_x-1) && cursor.y == y+1){ color = dotgrid.theme.active.b_high; } + else if(cursor.x == x+1 && cursor.y == y+1){ color = dotgrid.theme.active.b_high; } this.draw_marker({ x:parseInt(x * dotgrid.grid_width) + dotgrid.grid_width, diff --git a/desktop/sources/scripts/lib/theme.js b/desktop/sources/scripts/lib/theme.js index c094aaa..0999b50 100644 --- a/desktop/sources/scripts/lib/theme.js +++ b/desktop/sources/scripts/lib/theme.js @@ -1,6 +1,6 @@ 'use strict'; -function Theme(default_theme = {background: "#222", f_high: "#fff", f_med: "#777", f_low: "#444", f_inv: "#fff", b_high: "#000", b_med: "#aaa", b_low: "#000", b_inv: "#000"}) +function Theme(default_theme = {background: "#222", f_high: "#fff", f_med: "#ccc", f_low: "#999", f_inv: "#fff", b_high: "#888", b_med: "#666", b_low: "#444", b_inv: "#000" }) { let themer = this; @@ -12,8 +12,8 @@ function Theme(default_theme = {background: "#222", f_high: "#fff", f_med: "#777 this.collection = { default: default_theme, - noir: {background: "#222", f_high: "#fff", f_med: "#777", f_low: "#444", f_inv: "#fff", b_high: "#000", b_med: "#aaa", b_low: "#000", b_inv: "#000" }, - pale: {background: "#e1e1e1", f_high: "#000", f_med: "#777", f_low: "#aaa", f_inv: "#000", b_high: "#000", b_med: "#aaa", b_low: "#ccc", b_inv: "#fff" } + noir: {background: "#222", f_high: "#fff", f_med: "#ccc", f_low: "#999", f_inv: "#fff", b_high: "#888", b_med: "#666", b_low: "#444", b_inv: "#000" }, + pale: {background: "#e1e1e1", f_high: "#000", f_med: "#777", f_low: "#fff", f_inv: "#000", b_high: "#eee", b_med: "#999", b_low: "#ccc", b_inv: "#fff" } } this.install = function(host = document.body,callback)