lzstealth/pulse-signage
1
0 Fork 0
Code Issues Pull Requests Actions Packages Activity

Allow one-pixel template regions
Publish Docker Image / build-and-push-existing-registry (./build/Dockerfile, web, pulse-signage-web) (push) Successful in 1m23s
Details
Publish Docker Image / build-and-push-existing-registry (./build/Dockerfile.player, player, pulse-signage-player) (push) Successful in 32s
Details

Browse Source
This commit is contained in:
lzstealth committed 2026-10-19 17:55:56 +01:00
1 parent 8d75b12354
commit 821593dd8f
9 files changed
+41 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/web/public/js/templates/template-designer-utils.js
+5 -5
View File
@@ -56,15 +56,15 @@
if (ratio.ratio >= 1) {
var baseWidth = locked ? 420 : 300;
return {
width: Math.max(12, Math.round(baseWidth)),
height: Math.max(12, Math.round(baseWidth / ratio.ratio))
width: Math.max(1, Math.round(baseWidth)),
height: Math.max(1, Math.round(baseWidth / ratio.ratio))
};
}
var baseHeight = locked ? 300 : 240;
return {
width: Math.max(12, Math.round(baseHeight * ratio.ratio)),
height: Math.max(12, Math.round(baseHeight))
width: Math.max(1, Math.round(baseHeight * ratio.ratio)),
height: Math.max(1, Math.round(baseHeight))
};
}
@@ -297,7 +297,7 @@
function clampRegion(region, size, minSize) {
var bounds = size || { width: 1920, height: 1080 };
var minimum = minSize || 12;
var minimum = minSize || 1;
var x = clamp(region.x, 0, bounds.width - minimum);
var y = clamp(region.y, 0, bounds.height - minimum);
var width = Math.max(minimum, region.width);
src/web/public/js/templates/template-designer.js
+22 -22
View File
@@ -140,10 +140,10 @@
if (ratio) {
if (ratio.ratio >= 1) {
var baseWidth = locked ? 420 : 300;
return { width: Math.max(12, Math.round(baseWidth)), height: Math.max(12, Math.round(baseWidth / ratio.ratio)) };
return { width: Math.max(1, Math.round(baseWidth)), height: Math.max(1, Math.round(baseWidth / ratio.ratio)) };
}
var baseHeight = locked ? 300 : 240;
return { width: Math.max(12, Math.round(baseHeight * ratio.ratio)), height: Math.max(12, Math.round(baseHeight)) };
return { width: Math.max(1, Math.round(baseHeight * ratio.ratio)), height: Math.max(1, Math.round(baseHeight)) };
}
return { width: locked ? 420 : 300, height: locked ? 240 : 120 };
}
@@ -1015,7 +1015,7 @@
function fitRegionToCanvas(region, aspect) {
var size = getCanvasSize();
var minSize = 12;
var minSize = 1;
var next = {
x: Math.round(Number(region && region.x !== undefined ? region.x : 0)),
y: Math.round(Number(region && region.y !== undefined ? region.y : 0)),
@@ -1075,8 +1075,8 @@
var next = {
x: current.x,
y: current.y,
width: Math.max(12, Math.round(current.width || 0)),
height: Math.max(12, Math.round(current.height || 0))
width: Math.max(1, Math.round(current.width || 0)),
height: Math.max(1, Math.round(current.height || 0))
};
var lockRatio = normalizeLockRatio(current.lock_ratio);
var aspect = lockRatio ? parseLockRatio(lockRatio) : null;
@@ -1084,20 +1084,20 @@
if (aspect) {
if (changedField === 'height') {
next.width = Math.max(12, Math.round(next.height * aspect.ratio));
next.width = Math.max(1, Math.round(next.height * aspect.ratio));
} else {
next.height = Math.max(12, Math.round(next.width / aspect.ratio));
next.height = Math.max(1, Math.round(next.width / aspect.ratio));
}
if (next.width > size.width || next.height > size.height) {
var scale = Math.min(size.width / Math.max(1, next.width), size.height / Math.max(1, next.height), 1);
if (scale < 1) {
next.width = Math.max(12, Math.round(next.width * scale));
next.height = Math.max(12, Math.round(next.height * scale));
next.width = Math.max(1, Math.round(next.width * scale));
next.height = Math.max(1, Math.round(next.height * scale));
if (changedField === 'height') {
next.width = Math.max(12, Math.round(next.height * aspect.ratio));
next.width = Math.max(1, Math.round(next.height * aspect.ratio));
} else {
next.height = Math.max(12, Math.round(next.width / aspect.ratio));
next.height = Math.max(1, Math.round(next.width / aspect.ratio));
}
}
}
@@ -1237,9 +1237,9 @@
var current = readCard(card);
var aspect = parseLockRatio(current.lock_ratio);
if (aspect && changedField === 'width' && current.width > 0) {
writeCard(card, { height: Math.max(12, Math.round(current.width / aspect.ratio)) });
writeCard(card, { height: Math.max(1, Math.round(current.width / aspect.ratio)) });
} else if (aspect && changedField === 'height' && current.height > 0) {
writeCard(card, { width: Math.max(12, Math.round(current.height * aspect.ratio)) });
writeCard(card, { width: Math.max(1, Math.round(current.height * aspect.ratio)) });
}
} else {
normalizeRegionCard(card, changedField);
@@ -1589,7 +1589,7 @@
function clampRegion(region) {
var size = getCanvasSize();
var minSize = 12;
var minSize = 1;
var x = clamp(region.x, 0, size.width - minSize);
var y = clamp(region.y, 0, size.height - minSize);
var width = Math.max(minSize, region.width);
@@ -1619,7 +1619,7 @@
draft.end = toCanvasPoint(upEvent);
var width = Math.abs(draft.end.x - draft.start.x);
var height = Math.abs(draft.end.y - draft.start.y);
if (width >= 8 && height >= 8) {
if (width >= 1 && height >= 1) {
var region = fitRegionToCanvas({ x: Math.min(draft.start.x, draft.end.x), y: Math.min(draft.start.y, draft.end.y), width: width, height: height });
var name = getNextDefaultRegionName('text');
addRegion({ region_key: name, label: name, region_type: 'text', x: region.x, y: region.y, width: region.width, height: region.height, z_index: 1 });
@@ -1671,7 +1671,7 @@
var lockRatio = normalizeLockRatio(startRegion.lock_ratio);
var aspect = lockRatio ? parseLockRatio(lockRatio) : null;
var canvasSize = getCanvasSize();
var minSize = 12;
var minSize = 1;
function clampResizeDelta(dx, dy) {
if (dir.indexOf('w') !== -1) {
@@ -1690,17 +1690,17 @@
}
function fitFromWidth(width) {
var nextWidth = Math.max(12, Math.round(width));
var nextWidth = Math.max(1, Math.round(width));
return {
width: nextWidth,
height: aspect ? Math.max(12, Math.round(nextWidth / aspect.ratio)) : startRegion.height
height: aspect ? Math.max(1, Math.round(nextWidth / aspect.ratio)) : startRegion.height
};
}
function fitFromHeight(height) {
var nextHeight = Math.max(12, Math.round(height));
var nextHeight = Math.max(1, Math.round(height));
return {
width: aspect ? Math.max(12, Math.round(nextHeight * aspect.ratio)) : startRegion.width,
width: aspect ? Math.max(1, Math.round(nextHeight * aspect.ratio)) : startRegion.width,
height: nextHeight
};
}
@@ -1752,8 +1752,8 @@
if (dir.indexOf('n') !== -1) { next.y = startRegion.y + dy; next.height = startRegion.height - dy; }
if (dir.indexOf('s') !== -1) { next.height = startRegion.height + dy; }
}
if (next.width < 12) { if (dir.indexOf('w') !== -1) { next.x -= 12 - next.width; } next.width = 12; }
if (next.height < 12) { if (dir.indexOf('n') !== -1) { next.y -= 12 - next.height; } next.height = 12; }
if (next.width < 1) { if (dir.indexOf('w') !== -1) { next.x -= 1 - next.width; } next.width = 1; }
if (next.height < 1) { if (dir.indexOf('n') !== -1) { next.y -= 1 - next.height; } next.height = 1; }
next = fitRegionToCanvas(next, aspect);
writeCard(cardAt(index), { x: next.x, y: next.y, width: next.width, height: next.height });
markTemplateFormDirty();
src/web/views/signage/templates/form.hbs
+2 -2
View File
@@ -174,8 +174,8 @@
<label>Z-Index<input class="form-control" type="number" name="region_z[]" min="1" step="1" value="1" required /></label>
</div>
<div class="region-field-grid region-field-grid--size">
<label>Width<input class="form-control" type="number" name="region_width[]" value="300" required /></label>
<label>Height<input class="form-control" type="number" name="region_height[]" value="120" required /></label>
<label>Width<input class="form-control" type="number" name="region_width[]" min="1" step="1" value="300" required /></label>
<label>Height<input class="form-control" type="number" name="region_height[]" min="1" step="1" value="120" required /></label>
<label>Lock ratio<input class="form-control" type="text" name="region_lock_ratio[]" value="" maxlength="20" data-limit-text-length placeholder="Ratio, e.g. 16:9" /></label>
<label>Remove<button type="button" class="btn btn-outline-danger w-100" data-region-remove-button{{#if isEdit}} disabled{{/if}}>Remove</button></label>
</div>