From c2376d62e232b952923cdda55bdb0bbc3c59063c Mon Sep 17 00:00:00 2001
From: Andrew <18502096+classicrocker883@users.noreply.github.com>
Date: Wed, 22 Nov 2023 03:40:50 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20JyersUI/ProUI=20narrowing?=
=?UTF-8?q?=20(#26453)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
Marlin/src/lcd/e3v2/jyersui/dwin.cpp | 2 +-
Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index cf78bdd7c6a..6e7898a389f 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -389,7 +389,7 @@ private:
// Draw value text on
if (viewer_print_value) {
- xy_int_t offset { 0, cell_height_px / 2 - 6 };
+ xy_uint_t offset { 0, cell_height_px / 2 - 6 };
if (isnan(bedlevel.z_values[x][y])) { // undefined
dwinDrawString(false, font6x12, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset.y, F("X"));
}
diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
index eea4ac97f0c..f2fe008667c 100644
--- a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
+++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -211,9 +211,9 @@ bool BedLevelTools::meshValidate() {
void BedLevelTools::drawBedMesh(int16_t selected/*=-1*/, uint8_t gridline_width/*=1*/, uint16_t padding_x/*=8*/, uint16_t padding_y_top/*=(40 + 53 - 7)*/) {
drawing_mesh = true;
- const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x;
- const uint16_t cell_width_px = total_width_px / (GRID_MAX_POINTS_X);
- const uint16_t cell_height_px = total_width_px / (GRID_MAX_POINTS_Y);
+ const uint16_t total_width_px = DWIN_WIDTH - padding_x - padding_x,
+ cell_width_px = total_width_px / (GRID_MAX_POINTS_X),
+ cell_height_px = total_width_px / (GRID_MAX_POINTS_Y);
const float v_max = abs(getMaxValue()), v_min = abs(getMinValue()), rmax = _MAX(v_min, v_max);
// Clear background from previous selection and select new square
@@ -247,7 +247,7 @@ bool BedLevelTools::meshValidate() {
// Draw value text on
const uint8_t fs = DWINUI::fontWidth(meshfont);
if (viewer_print_value) {
- xy_int_t offset { 0, cell_height_px / 2 - fs };
+ xy_uint_t offset { 0, cell_height_px / 2 - fs };
if (isnan(bedlevel.z_values[x][y])) { // undefined
dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset.y, F("X"));
}