From e852732ea8e71d7e969520d0bcd4f242dc6755b2 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Fri, 22 Oct 2021 17:57:30 +1300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20E3V2=20width/height=20defi?=
 =?UTF-8?q?nes=20(#22994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/lcd/e3v2/common/dwin_api.h   | 7 ++++---
 Marlin/src/lcd/e3v2/creality/dwin_lcd.h | 3 ---
 Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h | 5 -----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
index 735907e4a40e..aea13aa621e2 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -23,10 +23,11 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#ifndef DWIN_WIDTH
+#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
+  #define DWIN_WIDTH  480
+  #define DWIN_HEIGHT 272
+#else
   #define DWIN_WIDTH  272
-#endif
-#ifndef DWIN_HEIGHT
   #define DWIN_HEIGHT 480
 #endif
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
index 115781f09438..b37a65977c5c 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -29,9 +29,6 @@
  * @brief    迪文屏控制操作函数
  ********************************************************************************/
 
-#define DWIN_WIDTH  272
-#define DWIN_HEIGHT 480
-
 #include "../common/dwin_api.h"
 #include "../common/dwin_set.h"
 #include "../common/dwin_font.h"
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
index 65d9394a8544..3e80a0103ee8 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -28,11 +28,6 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
-  #define DWIN_WIDTH  480
-  #define DWIN_HEIGHT 272
-#endif
-
 #include "../common/dwin_api.h"
 
 // Picture ID