Skip to content

🚸 Fix TFT menu positioning#25942

Merged
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-2.1.xfrom
thinkyhead:bf2_menu_patch_PR
Jun 8, 2023
Merged

🚸 Fix TFT menu positioning#25942
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-2.1.xfrom
thinkyhead:bf2_menu_patch_PR

Conversation

@thinkyhead
Copy link
Member

Fix menu positioning issues described in #25475 using changes proposed by @helakejr

@thinkyhead
Copy link
Member Author

CC: @uncellon — Does these changes fit in alright with your recent changes?

@thinkyhead thinkyhead force-pushed the bf2_menu_patch_PR branch from 93048a0 to 7976cec Compare June 7, 2023 07:55
#define BTN_HEIGHT 52
#define X_MARGIN 20
#define Y_MARGIN 15
#define Y_OFFSET TERN(HAS_UI_480x272, 28, 34)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e.g., Maybe we should just be using FONT_LINE_HEIGHT which may be 34, 26, or 24 depending on the UI height and the selected TFT_FONT.

Co-Authored-By: Ed <751406+helakejr@users.noreply.github.com>
@thinkyhead thinkyhead force-pushed the bf2_menu_patch_PR branch from 7976cec to 2bff053 Compare June 7, 2023 07:58
@uncellon
Copy link
Contributor

uncellon commented Jun 7, 2023

@thinkyhead
One moment, now I will check

@uncellon
Copy link
Contributor

uncellon commented Jun 7, 2023

I tested portrait (480x320) and landscape (320x480) orientations:

  • Main screen - OK
  • Menu screen with navigation arrows - OK
  • Homing screen - partially. Unfortunately, I haven't had time yet to fix this screen in vertical orientation 🥺

@thinkyhead
Copy link
Member Author

Homing screen - partially. Unfortunately, I haven't had time yet to fix this screen in vertical orientation

Maybe @helakejr is in the mood to add some more improvements…?

@uncellon
Copy link
Contributor

uncellon commented Jun 7, 2023

I think I'll fix it this week. I will take PR (#25207) as an example (the design of the vertical homing menu).

@thinkyhead thinkyhead merged commit 54a82b4 into MarlinFirmware:bugfix-2.1.x Jun 8, 2023
@thinkyhead thinkyhead deleted the bf2_menu_patch_PR branch June 8, 2023 01:58
Djonker83 added a commit to Djonker83/Marlin that referenced this pull request Jun 16, 2023
* 🩹 Update KEDI / GODI LCD_PINS_EN pin (MarlinFirmware#25886)

* [cron] Bump distribution date (2023-05-29)

* 🩹 Fix and improve GT2560 pins (MarlinFirmware#25890)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🔨 Install 'heatshrink' if needed (MarlinFirmware#25896)

* [cron] Bump distribution date (2023-05-30)

* 🔧 Default has Heated Bed (MarlinFirmware#25895)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 Probe Wizard display fix

* 🧑‍💻 ExtUI::onLevelingStart/Done for all leveling (MarlinFirmware#25913)

* 🌐 Update Russian translation (MarlinFirmware#25840)

* 🌐 Remove unused strings

* 🔧 Update LCD with NeoPixel Contrast (MarlinFirmware#25893)

* [cron] Bump distribution date (2023-06-02)

* 📝 M122 comment

* 🔨 Clarify env error (MarlinFirmware#25915)

* 🔨 Fix pins debugging for Simulator

* 🎨 Lowercase method / data member names (MarlinFirmware#25914)

* 🧑‍💻 numtostr use functions

* 🧑‍💻 Dump BOTH and EITHER macros (MarlinFirmware#25908)

* 🧑‍💻 Remove LOOP macros (MarlinFirmware#25917)

* [cron] Bump distribution date (2023-06-03)

* 🎨 Lowercase followup (MarlinFirmware#25923)

Followup to MarlinFirmware#25914

* 🔨 STM32H723VG (1024KB) (MarlinFirmware#25921)

* 🩹 Endstop hit state followup (MarlinFirmware#25885)

Followup to MarlinFirmware#25574

* 🧑‍💻 Fix narrowing conversions (MarlinFirmware#25924)

* 🔧 BTT SKR 3 has onboard endstop pullups (MarlinFirmware#24876)

* 🐛 Fix M25/M125 for LCDs with ui.resume_print (MarlinFirmware#24877)

* [cron] Bump distribution date (2023-06-04)

* ✏️ Fix LCD contrast typo (MarlinFirmware#25929)

* 🩹 Fix D576 buffer underrun reporting (MarlinFirmware#25931)

* [cron] Bump distribution date (2023-06-05)

* 🔧 TMC Driver axis baud for Soft Serial (MarlinFirmware#25664)

* 🎨 Detab C/C++

* 🧑‍💻 Dir change is AxisBits

Followup to MarlinFirmware#25761

* 🩹 Wrap HAS_DISPLAY for if()

Followup to MarlinFirmware#24877

* 🧑‍💻 Fix mfconfig trailing space

* [cron] Bump distribution date (2023-06-06)

* 🩹 Fix JyersUI corner pos

Followup to MarlinFirmware#25631

* 🧑‍💻 Bypass error in build_example

* 🧑‍💻 Suppress narrowing warnings

Followup to MarlinFirmware#25924

* ⚡️ Mixer label in PROGMEM

* 🩹 Conditional include probe.h

* 🧑‍💻 Use Flags<> for runout (MarlinFirmware#25938)

* [cron] Bump distribution date (2023-06-07)

* 🌐 Update Italian language (MarlinFirmware#25940)

* 🔨 Teensy 4.1 pins env check (MarlinFirmware#25937)

* [cron] Bump distribution date (2023-06-08)

* 🔧 Z-MIN as CREALITY V25 S1 probe

* 🚸 Fix TFT menu positioning (MarlinFirmware#25942)

Co-authored-by: Ed <751406+helakejr@users.noreply.github.com>

* 🔨 Clean up some BTT envs, etc. (MarlinFirmware#25934)

Followup to MarlinFirmware#25921

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* 🚸 General TFT cleanup

* 🚸 Portrait TS35 move axis screen (MarlinFirmware#25945)

* 🔨 Update STM32Hxx boards/variants

Followup to MarlinFirmware#25934

* 🔨 Fix serial port #error text

* [cron] Bump distribution date (2023-06-09)

* 🐛 Fix _MINMAX_TEST typo (MarlinFirmware#25954)

* 🩹 Conditional u8g for SAMD21 (MarlinFirmware#25947)

* 🔨 Simpler distinct firmware rename (MarlinFirmware#25957)

* 🐛 Fix dummy thermistors 998-999 (MarlinFirmware#25956)

* [cron] Bump distribution date (2023-06-10)

* 🔨 Firmware rename followup (MarlinFirmware#25966)

Followup to MarlinFirmware#25957

* [cron] Bump distribution date (2023-06-11)

* 🔨 SKR Mini E3 v3.0.1 XFER (MarlinFirmware#25955)

* [cron] Bump distribution date (2023-06-12)

* ♻️ Simplify SERIAL_ECHO (MarlinFirmware#25928)

Since this increases AVR code size, try to optimize further.

* 🔥 Remove VAkE 403D (MarlinFirmware#25969)

* [cron] Bump distribution date (2023-06-13)

* 🎨 Lowercase methods, functions, data members (MarlinFirmware#25939)

For: TFT, DGUS, MarlinUI, Anycubic, JyersUI, CrealityUI

* 🔧 Sanity check IA_CREALITY mesh size

* [cron] Bump distribution date (2023-06-15)

* 🎨 Lowercase followup

Followup to MarlinFirmware#25939

* 🎨 Group STM32G0 pins includes (MarlinFirmware#25977)

* 📝 Document Manta E3 EZ / E3V2 LCD custom wiring (MarlinFirmware#25976)

* ✨ BTT RAMPS 1.6+ (MarlinFirmware#25970)

* [cron] Bump distribution date (2023-06-16)

---------

Co-authored-by: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Co-authored-by: thinkyhead <thinkyhead@users.noreply.github.com>
Co-authored-by: DejitaruJin <dejitarujin@gmail.com>
Co-authored-by: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com>
Co-authored-by: I3DBeeTech <129617321+I3DBeeTech@users.noreply.github.com>
Co-authored-by: alextrical <35117191+alextrical@users.noreply.github.com>
Co-authored-by: ellensp <530024+ellensp@users.noreply.github.com>
Co-authored-by: Manuel McLure <manuel@mclure.org>
Co-authored-by: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Co-authored-by: Andrew <18502096+classicrocker883@users.noreply.github.com>
Co-authored-by: kisslorand <50251547+kisslorand@users.noreply.github.com>
Co-authored-by: Roi Rodríguez Huertas <roiamorin69@gmail.com>
Co-authored-by: Ed <751406+helakejr@users.noreply.github.com>
Co-authored-by: Dmitry Plastinin <Uncellon@yandex.ru>
Co-authored-by: Miguel Risco-Castillo <mriscoc@users.noreply.github.com>
Co-authored-by: Bart Meijer <brupje@gmail.com>
Andy-Big pushed a commit to Andy-Big/Marlin_FB_Reborn that referenced this pull request Jul 19, 2023
Co-authored-by: Ed <751406+helakejr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants