From a3923424c7f214b398a2241d703f1f775301fc99 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 12 Nov 2018 02:37:31 -0600
Subject: [PATCH] Clean up LCD width/height determination

---
 .../examples/Geeetech/GT2560/Configuration.h  |  2 +-
 Marlin/src/inc/Conditionals_post.h            | 44 +++++++------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
index 5c19c578b..9afc16c4a 100644
--- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
@@ -2036,7 +2036,7 @@
 #if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(MKS_MINI_12864)
   #define SDSUPPORT   // Force SD Card support on for these displays
 #elif DISABLED(LIGHTWEIGHT_UI)
-  #define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20.
+  #define LCD_WIDTH 20 // Default is 22. For this Geeetech use 20.
 #endif
 
 // Allow servo angle to be edited and saved to EEPROM
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1c7a3cb0b..a8663fdf6 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -1630,37 +1630,25 @@
 #endif
 
 // Get LCD character width/height, which may be overridden by pins, configs, etc.
-#if HAS_GRAPHICAL_LCD
-  #ifndef LCD_WIDTH
-    #ifdef LCD_WIDTH_OVERRIDE
-      #define LCD_WIDTH LCD_WIDTH_OVERRIDE
-    #elif ENABLED(LIGHTWEIGHT_UI)
-      #define LCD_WIDTH 16
-    #else
-      #define LCD_WIDTH 22
-    #endif
-  #endif
-  #ifndef LCD_HEIGHT
-    #ifdef LCD_HEIGHT_OVERRIDE
-      #define LCD_HEIGHT LCD_HEIGHT_OVERRIDE
-    #elif ENABLED(LIGHTWEIGHT_UI)
-      #define LCD_HEIGHT 4
-    #else
-      #define LCD_HEIGHT 5
-    #endif
-  #endif
-#elif ENABLED(ULTIPANEL)
-  #ifndef LCD_WIDTH
+#ifndef LCD_WIDTH
+  #if ENABLED(LIGHTWEIGHT_UI)
+    #define LCD_WIDTH 16
+  #elif HAS_GRAPHICAL_LCD
+    #define LCD_WIDTH 22
+  #elif ENABLED(ULTIPANEL)
     #define LCD_WIDTH 20
-  #endif
-  #ifndef LCD_HEIGHT
-    #define LCD_HEIGHT 4
-  #endif
-#elif HAS_SPI_LCD
-  #ifndef LCD_WIDTH
+  #elif HAS_SPI_LCD
     #define LCD_WIDTH 16
   #endif
-  #ifndef LCD_HEIGHT
+#endif
+#ifndef LCD_HEIGHT
+  #if ENABLED(LIGHTWEIGHT_UI)
+    #define LCD_HEIGHT 4
+  #elif HAS_GRAPHICAL_LCD
+    #define LCD_HEIGHT 5
+  #elif ENABLED(ULTIPANEL)
+    #define LCD_HEIGHT 4
+  #elif HAS_SPI_LCD
     #define LCD_HEIGHT 2
   #endif
 #endif