muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Macros: suppress placeholder color stripes (#dedede, #fff, ...)

Browse Source 
The bbctrl controller seeds new macros with placeholder colors like
'#dedede' and '#ffffff'. Treating those as 'configured' lit up the
asymmetric 6 px left stripe on every default macro, which looked
lopsided.

Add control-view.has_macro_color() that filters out a fixed set of
default placeholders plus anything within the near-white band
(R+G+B > 690). The .has-color class and the inline border-left-color
style are gated on that helper, so unconfigured macros render as
clean symmetric slate tiles.

Tested live on http://10.1.10.55/#control with the existing macro
config (#dedede): button now renders without the gray stripe.
This commit is contained in:
Henrik Muehe
2026-05-01 08:18:28 +02:00
parent 5926316a25
commit 73c6a4f160
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/js/control-view.js
View File

@@ -186,6 +186,33 @@ module.exports = {
return [weight, color].join(";");
},
// Should the macro row render a colored left stripe for this
// macro? Only when the user has explicitly picked a color. The
// controller seeds new macros with default placeholders like
// "#ffffff" or "#dedede"; treat anything that close to white as
// "no color".
has_macro_color(macros) {
if (!macros || typeof macros.color !== "string") return false;
const c = macros.color.trim().toLowerCase();
if (!c) return false;
const defaults = [
"#fff", "#ffffff", "#fefefe", "#fdfdfd", "#fcfcfc",
"#dedede", "#dddddd", "#cccccc",
];
if (defaults.indexOf(c) !== -1) return false;
// Fallback: if the color is very close to white (sum of RGB
// > 690), suppress the stripe.
const m = c.match(/^#([0-9a-f]{6})$/);
if (m) {
const v = parseInt(m[1], 16);
const r = (v >> 16) & 0xff;
const g = (v >> 8) & 0xff;
const b = v & 0xff;
if (r + g + b > 690) return false;
}
return true;
},
jog_fn: function (x_jog, y_jog, z_jog, a_jog) {
const amount = this.jog_incr_amounts[this.display_units][this.jog_incr];

7
src/pug/templates/control-view.pug
View File

@@ -246,13 +246,16 @@ script#control-view-template(type="text/x-template")
.stat-sub(v-else) Line · ETA --
// ----- Macro row (slice 0..7); full list lives in Settings → Macros -----
// The colored left stripe (.has-color) is suppressed for white,
// near-white and other default placeholder colors so unconfigured
// macros render as clean slate tiles instead of looking lopsided.
.macro-row(v-if="state.macros && state.macros.length")
button.macro-btn(v-for="(index, macros) in state.macros.slice(0, 8)",
title="Click to run macro",
@click="run_macro(index)",
:disabled="!is_ready",
:class="{'has-color': macros.color && macros.color !== '#ffffff' && macros.color !== '#fff'}",
:style="macros.color && macros.color !== '#ffffff' && macros.color !== '#fff' ? {borderLeftColor: macros.color} : {}")
:class="{'has-color': has_macro_color(macros)}",
:style="has_macro_color(macros) ? {borderLeftColor: macros.color} : {}")
span.mnum {{index + 1}}
span.mname {{macros.name || ('Macro ' + (index + 1))}}