sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚸 Fix more MarlinUI title centering (#26440)

Browse Source 
Followup to #26339
This commit is contained in:
Keith Bennett
2023-11-19 23:24:32 -08:00
committed by GitHub
parent 006768ab58
commit 0142783836
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View File

@@ -1179,7 +1179,7 @@ void MarlinUI::draw_status_screen() {
int8_t llen = ftpl ? expand_u8str(estr, ftpl, itemIndex, itemStringC, itemStringF, n - vlen) : 0; int8_t llen = ftpl ? expand_u8str(estr, ftpl, itemIndex, itemStringC, itemStringF, n - vlen) : 0;
bool mv_colon = false; bool mv_colon = false;
if (vlen) { if (vlen && !center) {
// Move the leading colon from the value to the label below // Move the leading colon from the value to the label below
mv_colon = (*vstr == ':'); mv_colon = (*vstr == ':');
// Shorter value, wider label // Shorter value, wider label

2
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View File

@@ -983,7 +983,7 @@ void MarlinUI::draw_status_screen() {
int8_t llen = ftpl ? expand_u8str(estr, ftpl, itemIndex, itemStringC, itemStringF, n - vlen) : 0; int8_t llen = ftpl ? expand_u8str(estr, ftpl, itemIndex, itemStringC, itemStringF, n - vlen) : 0;
bool mv_colon = false; bool mv_colon = false;
if (vlen) { if (vlen && !center) {
// Move the leading colon from the value to the label below // Move the leading colon from the value to the label below
mv_colon = (*vstr == ':'); mv_colon = (*vstr == ':');
// Shorter value, wider label // Shorter value, wider label

14
Marlin/src/lcd/e3v2/creality/dwin.cpp
View File

@@ -1384,7 +1384,19 @@ void hmiMoveDone(const AxisEnum axis) {
dwinUpdateLCD(); dwinUpdateLCD();
return; return;
} }
LIMIT(hmiValues.offset_value, (PROBE_OFFSET_ZMIN) * 100, (PROBE_OFFSET_ZMAX) * 100);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) && defined(PROBE_OFFSET_ZMIN)
#define _OFFSET_ZMIN (PROBE_OFFSET_ZMIN)
#else
#define _OFFSET_ZMIN -20
#endif
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) && defined(PROBE_OFFSET_ZMAX)
#define _OFFSET_ZMAX (PROBE_OFFSET_ZMAX)
#else
#define _OFFSET_ZMAX 20
#endif
LIMIT(hmiValues.offset_value, _OFFSET_ZMIN * 100, _OFFSET_ZMAX * 100);
last_zoffset = dwin_zoffset; last_zoffset = dwin_zoffset;
dwin_zoffset = hmiValues.offset_value / 100.0f; dwin_zoffset = hmiValues.offset_value / 100.0f;
#if ANY(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP) #if ANY(BABYSTEP_ZPROBE_OFFSET, JUST_BABYSTEP)

2
Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
View File

@@ -324,7 +324,7 @@ void MarlinUI::draw_status_message(const bool blink) {
int8_t vlen = vstr ? utf8_strlen(vstr) : 0; int8_t vlen = vstr ? utf8_strlen(vstr) : 0;
bool mv_colon = false; bool mv_colon = false;
if (vlen) { if (vlen && !center) {
// Move the leading colon from the value to the label below // Move the leading colon from the value to the label below
mv_colon = (*vstr == ':'); mv_colon = (*vstr == ':');
// Shorter value, wider label // Shorter value, wider label

7
Marlin/src/lcd/e3v2/proui/dwin.h
View File

@@ -39,13 +39,6 @@
#include "../../../feature/leds/leds.h" #include "../../../feature/leds/leds.h"
#endif #endif
#if ANY(BABYSTEPPING, HAS_BED_PROBE)
#define HAS_ZOFFSET_ITEM 1
#if !HAS_BED_PROBE
#define JUST_BABYSTEP 1
#endif
#endif
namespace GET_LANG(LCD_LANGUAGE) { namespace GET_LANG(LCD_LANGUAGE) {
#define _MSG_PREHEAT(N) \ #define _MSG_PREHEAT(N) \
LSTR MSG_PREHEAT_##N = _UxGT("Preheat ") PREHEAT_## N ##_LABEL; \ LSTR MSG_PREHEAT_##N = _UxGT("Preheat ") PREHEAT_## N ##_LABEL; \