From 324dbb7d8a908bcd5080337ae34fba82b1683291 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 20 Aug 2021 20:35:35 +1000 Subject: [PATCH] GPS, EXT_ANT icon relative to target screen width --- radio/src/gui/colorlcd/layouts/topbar_impl.cpp | 7 +++---- radio/src/targets/horus/libopenui_config.h | 1 + radio/src/targets/nv14/libopenui_config.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp index 717dd6c37..58cfefef9 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp @@ -98,15 +98,14 @@ void TopbarImpl::paint(BitmapBuffer * dc) if (gpsData.fix) { char s[10]; sprintf(s, "%d", gpsData.numSat); - dc->drawText(LCD_W-148, 4, s, FONT(XS) | CENTERED | FOCUS_COLOR); + dc->drawText(GPS_X, 4, s, FONT(XS) | CENTERED | FOCUS_COLOR); } - dc->drawBitmapPattern(LCD_W - 158, 22, LBM_TOPMENU_GPS, + dc->drawBitmapPattern(GPS_X - 10, 22, LBM_TOPMENU_GPS, (gpsData.fix) ? FOCUS_COLOR : MENU_TITLE_DISABLE_COLOR); #endif // USB icon if (usbPlugged()) { - LcdFlags flags = FOCUS_COLOR; if (getSelectedUsbMode() == USB_UNSELECTED_MODE) { flags = MENU_TITLE_DISABLE_COLOR; @@ -132,7 +131,7 @@ void TopbarImpl::paint(BitmapBuffer * dc) #if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA) if (isModuleXJT(INTERNAL_MODULE) && isExternalAntennaEnabled()) { - dc->drawBitmapPattern(LCD_W-94, 4, LBM_TOPMENU_ANTENNA, FOCUS_COLOR); + dc->drawBitmapPattern(RSSI_X - 4, 4, LBM_TOPMENU_ANTENNA, FOCUS_COLOR); } #endif diff --git a/radio/src/targets/horus/libopenui_config.h b/radio/src/targets/horus/libopenui_config.h index 8cae1840a..1ed9d0001 100644 --- a/radio/src/targets/horus/libopenui_config.h +++ b/radio/src/targets/horus/libopenui_config.h @@ -88,6 +88,7 @@ constexpr uint32_t RSSI_X = LCD_W - 90; constexpr uint32_t AUDIO_X = LCD_W - 130; constexpr uint32_t USB_X = LCD_W - 98; constexpr uint32_t LOG_X = LCD_W - 98; +constexpr uint32_t GPS_X = LCD_W - 148; constexpr uint32_t MENUS_TOOLBAR_BUTTON_WIDTH = 30; constexpr uint32_t MENUS_TOOLBAR_BUTTON_PADDING = 3; diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index ad525392e..a8e7f9380 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -88,6 +88,7 @@ constexpr uint32_t RSSI_X = LCD_W - 80; constexpr uint32_t AUDIO_X = LCD_W - 115; constexpr uint32_t USB_X = LCD_W - 82; constexpr uint32_t LOG_X = LCD_W - 82; +constexpr uint32_t GPS_X = LCD_W - 130; constexpr uint32_t MENUS_TOOLBAR_BUTTON_WIDTH = 30; constexpr uint32_t MENUS_TOOLBAR_BUTTON_PADDING = 3;