From 35776c5f4a69810c4adfd2f953719bf2e3ad02dd Mon Sep 17 00:00:00 2001 From: Richard Li Date: Tue, 22 Jun 2021 17:09:09 +0800 Subject: [PATCH] Use default theme for nv14, may customize the theme later. --- radio/src/gui/colorlcd/themes/480_default.cpp | 2 +- radio/src/gui/colorlcd/themes/flysky.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp index 5d5907536..77b5ac252 100644 --- a/radio/src/gui/colorlcd/themes/480_default.cpp +++ b/radio/src/gui/colorlcd/themes/480_default.cpp @@ -460,7 +460,7 @@ BitmapBuffer * Theme480::currentMenuBackground = nullptr; Theme480 Theme480; -#if LCD_W == 480 +#if LCD_W == 480 || LCD_H == 480 OpenTxTheme * defaultTheme = &Theme480; Theme * theme = &Theme480; #endif diff --git a/radio/src/gui/colorlcd/themes/flysky.cpp b/radio/src/gui/colorlcd/themes/flysky.cpp index a8c519d41..618a988ad 100644 --- a/radio/src/gui/colorlcd/themes/flysky.cpp +++ b/radio/src/gui/colorlcd/themes/flysky.cpp @@ -454,9 +454,9 @@ BitmapBuffer * FlyskyTheme::menuIconNormal[MENUS_ICONS_COUNT] = { nullptr }; BitmapBuffer * FlyskyTheme::menuIconSelected[MENUS_ICONS_COUNT] = { nullptr }; BitmapBuffer * FlyskyTheme::currentMenuBackground = nullptr; -FlyskyTheme flyskyTheme; +/*FlyskyTheme flyskyTheme; #if defined(PCBFLYSKY) OpenTxTheme * defaultTheme = &flyskyTheme; Theme * theme = &flyskyTheme; -#endif +#endif*/