diff --git a/firmware/application/apps/analog_audio_app.hpp b/firmware/application/apps/analog_audio_app.hpp index 28af04d98..3f84d5b97 100644 --- a/firmware/application/apps/analog_audio_app.hpp +++ b/firmware/application/apps/analog_audio_app.hpp @@ -244,7 +244,7 @@ class AnalogAudioView : public View { {"previous_zoom"sv, &previous_zoom}, // we are saving and restoring AMFM ZOOM factor from Settings. }}; - const Rect options_view_rect{0 * 8, 1 * 16, 30 * 8, 1 * 16}; + const Rect options_view_rect{0 * 8, 1 * 16, screen_width, 1 * 16}; const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16}; size_t spec_bw_index = 0; @@ -292,7 +292,7 @@ class AnalogAudioView : public View { std::unique_ptr options_widget{}; RecordView record_view{ - {0 * 8, 2 * 16, 30 * 8, 1 * 16}, + {0 * 8, 2 * 16, screen_width, 1 * 16}, u"AUD", u"AUDIO", RecordView::FileType::WAV, diff --git a/firmware/application/apps/capture_app.hpp b/firmware/application/apps/capture_app.hpp index 17e665969..12ae2854e 100644 --- a/firmware/application/apps/capture_app.hpp +++ b/firmware/application/apps/capture_app.hpp @@ -109,7 +109,7 @@ class CaptureAppView : public View { /*small*/ true}; RecordView record_view{ - {0 * 8, 2 * 16, 30 * 8, 1 * 16}, + {0 * 8, 2 * 16, screen_width, 1 * 16}, u"BBD_????.*", captures_dir, RecordView::FileType::RawS16, diff --git a/firmware/application/apps/soundboard_app.hpp b/firmware/application/apps/soundboard_app.hpp index 6dc3d17a4..7842a4c28 100644 --- a/firmware/application/apps/soundboard_app.hpp +++ b/firmware/application/apps/soundboard_app.hpp @@ -107,7 +107,7 @@ class SoundBoardView : public View { "<="}; Text page_info{ - {0, 29 * 8, 30 * 8, 16}}; + {0, 29 * 8, screen_width, 16}}; MenuView menu_view{ {0, 0, screen_width, 175}, @@ -147,7 +147,7 @@ class SoundBoardView : public View { "Random"}; ProgressBar progressbar{ - {0 * 8, 31 * 8 + 2, 30 * 8, 4}}; + {0 * 8, 31 * 8 + 2, screen_width, 4}}; TransmitterView tx_view{ 16 * 16, diff --git a/firmware/application/apps/ui_adsb_rx.hpp b/firmware/application/apps/ui_adsb_rx.hpp index ae4323fa1..adbe12874 100644 --- a/firmware/application/apps/ui_adsb_rx.hpp +++ b/firmware/application/apps/ui_adsb_rx.hpp @@ -230,7 +230,7 @@ class ADSBRxAircraftDetailsView : public View { "-"}; Text text_model{ - {0 * 8, 6 * 16, 30 * 8, 16}, + {0 * 8, 6 * 16, screen_width, 16}, "-"}; Text text_type{ @@ -238,19 +238,19 @@ class ADSBRxAircraftDetailsView : public View { "-"}; Text text_number_of_engines{ - {18 * 8, 8 * 16, 30 * 8, 16}, + {18 * 8, 8 * 16, screen_width, 16}, "-"}; Text text_engine_type{ - {0 * 8, 10 * 16, 30 * 8, 16}, + {0 * 8, 10 * 16, screen_width, 16}, "-"}; Text text_owner{ - {0 * 8, 12 * 16, 30 * 8, 16}, + {0 * 8, 12 * 16, screen_width, 16}, "-"}; Text text_operator{ - {0 * 8, 14 * 16, 30 * 8, 16}, + {0 * 8, 14 * 16, screen_width, 16}, "-"}; Button button_close{ @@ -312,7 +312,7 @@ class ADSBRxDetailsView : public View { "-"}; Text text_airline{ - {0 * 8, 4 * 16, 30 * 8, 16}, + {0 * 8, 4 * 16, screen_width, 16}, "-"}; Text text_country{ @@ -320,18 +320,18 @@ class ADSBRxDetailsView : public View { "-"}; Text text_infos{ - {0 * 8, 6 * 16, 30 * 8, 16}, + {0 * 8, 6 * 16, screen_width, 16}, "-"}; Text text_info2{ - {0 * 8, 7 * 16, 30 * 8, 16}, + {0 * 8, 7 * 16, screen_width, 16}, "-"}; Text text_frame_pos_even{ - {0 * 8, 14 * 16, 30 * 8, 16}, + {0 * 8, 14 * 16, screen_width, 16}, "-"}; Text text_frame_pos_odd{ - {0 * 8, 16 * 16, 30 * 8, 16}, + {0 * 8, 16 * 16, screen_width, 16}, "-"}; Button button_aircraft_details{ diff --git a/firmware/application/apps/ui_aprs_rx.hpp b/firmware/application/apps/ui_aprs_rx.hpp index 8b86d47aa..4aa860320 100644 --- a/firmware/application/apps/ui_aprs_rx.hpp +++ b/firmware/application/apps/ui_aprs_rx.hpp @@ -241,7 +241,7 @@ class APRSRxView : public View { // DEBUG RecordView record_view{ - {0 * 8, 1 * 16, 30 * 8, 1 * 16}, + {0 * 8, 1 * 16, screen_width, 1 * 16}, u"AFS_????.WAV", aprs_dir, RecordView::FileType::WAV, diff --git a/firmware/application/apps/ui_aprs_tx.hpp b/firmware/application/apps/ui_aprs_tx.hpp index 1cf123101..014c3b9cd 100644 --- a/firmware/application/apps/ui_aprs_tx.hpp +++ b/firmware/application/apps/ui_aprs_tx.hpp @@ -91,7 +91,7 @@ class APRSTXView : public View { ' '}; Text text_payload{ - {0 * 8, 5 * 16, 30 * 8, 16}, + {0 * 8, 5 * 16, screen_width, 16}, "-"}; Button button_set{ {0 * 8, 6 * 16, 80, 32}, diff --git a/firmware/application/apps/ui_battinfo.hpp b/firmware/application/apps/ui_battinfo.hpp index 45960c2e4..4628f6b3b 100644 --- a/firmware/application/apps/ui_battinfo.hpp +++ b/firmware/application/apps/ui_battinfo.hpp @@ -90,7 +90,7 @@ class BattinfoView : public View { "-"}; Text text_warn{ - {1 * 8, 8 * 16, 30 * 8, 2 * 16}, + {1 * 8, 8 * 16, screen_width, 2 * 16}, ""}; */ Button button_mode{ diff --git a/firmware/application/apps/ui_bht_tx.hpp b/firmware/application/apps/ui_bht_tx.hpp index 63b5cc367..71008bf31 100644 --- a/firmware/application/apps/ui_bht_tx.hpp +++ b/firmware/application/apps/ui_bht_tx.hpp @@ -218,7 +218,7 @@ class BHTView : public View { ' '}; ProgressBar progressbar{ - {0 * 8, 29 * 8, 30 * 8, 16}, + {0 * 8, 29 * 8, screen_width, 16}, }; TransmitterView tx_view{ diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index e6468bcb7..c65cff635 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -172,7 +172,7 @@ private: }; Text text_path { - { 0 * 8, 2 * 16, 30 * 8, 16 }, + { 0 * 8, 2 * 16, screen_width, 16 }, "", }; @@ -182,7 +182,7 @@ private: }; Text text_name { - { 0 * 8, 7 * 16, 30 * 8, 16 }, + { 0 * 8, 7 * 16, screen_width, 16 }, "", }; diff --git a/firmware/application/apps/ui_freqman.hpp b/firmware/application/apps/ui_freqman.hpp index 5392819df..8877a30a3 100644 --- a/firmware/application/apps/ui_freqman.hpp +++ b/firmware/application/apps/ui_freqman.hpp @@ -100,7 +100,7 @@ class FrequencySaveView : public FreqManBaseView { {{0 * 8, 6 * 16}, "Description:", Theme::getInstance()->bg_darkest->foreground}}; TextField field_description{ - {0 * 8, 7 * 16, 30 * 8, 1 * 16}, + {0 * 8, 7 * 16, screen_width, 1 * 16}, ""}; Button button_save{ diff --git a/firmware/application/apps/ui_iq_trim.hpp b/firmware/application/apps/ui_iq_trim.hpp index dff8f0f67..03d33a5e9 100644 --- a/firmware/application/apps/ui_iq_trim.hpp +++ b/firmware/application/apps/ui_iq_trim.hpp @@ -112,7 +112,7 @@ class IQTrimView : public View { }; TextField field_path{ - {0 * 8, 1 * 16, 30 * 8, 1 * 16}, + {0 * 8, 1 * 16, screen_width, 1 * 16}, "Open File..."}; Point pos_lines{0 * 8, 4 * 16}; diff --git a/firmware/application/apps/ui_mictx.hpp b/firmware/application/apps/ui_mictx.hpp index 6b61a8f0b..87c8610f4 100644 --- a/firmware/application/apps/ui_mictx.hpp +++ b/firmware/application/apps/ui_mictx.hpp @@ -350,7 +350,7 @@ class MicTXView : public View { }; Button tx_button{ - {10 * 8, 30 * 8, 10 * 8, 5 * 8}, + {10 * 8, screen_width, 10 * 8, 5 * 8}, "PTT TX", true}; diff --git a/firmware/application/apps/ui_playlist.hpp b/firmware/application/apps/ui_playlist.hpp index 72b50d7b3..4b4f5fd56 100644 --- a/firmware/application/apps/ui_playlist.hpp +++ b/firmware/application/apps/ui_playlist.hpp @@ -107,7 +107,7 @@ class PlaylistView : public View { void handle_replay_thread_done(uint32_t return_code); Text text_filename{ - {0 * 8, 0 * 16, 30 * 8, 16}}; + {0 * 8, 0 * 16, screen_width, 16}}; FrequencyField field_frequency{ {0 * 8, 1 * 16}}; @@ -145,7 +145,7 @@ class PlaylistView : public View { Theme::getInstance()->fg_green->background}; Text text_track{ - {0 * 8, 3 * 16, 30 * 8, 16}}; + {0 * 8, 3 * 16, screen_width, 16}}; NewButton button_prev{ {2 * 8, 4 * 16, 4 * 8, 2 * 16}, diff --git a/firmware/application/apps/ui_pocsag_tx.hpp b/firmware/application/apps/ui_pocsag_tx.hpp index f4eb242ca..b23e27dd8 100644 --- a/firmware/application/apps/ui_pocsag_tx.hpp +++ b/firmware/application/apps/ui_pocsag_tx.hpp @@ -122,10 +122,10 @@ class POCSAGTXView : public View { }}; Text text_message{ - {0 * 8, 16 * 8, 30 * 8, 16}, + {0 * 8, 16 * 8, screen_width, 16}, ""}; Text text_message_l2{ - {0 * 8, 18 * 8, 30 * 8, 16}, + {0 * 8, 18 * 8, screen_width, 16}, ""}; Button button_message{ diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp index 7e1a8f150..3126c9a29 100644 --- a/firmware/application/apps/ui_recon.cpp +++ b/firmware/application/apps/ui_recon.cpp @@ -335,7 +335,7 @@ ReconView::ReconView(NavigationView& nav) tx_view.hidden(true); // set record View - record_view = std::make_unique(Rect{0, 0, 30 * 8, 1 * 16}, + record_view = std::make_unique(Rect{0, 0, screen_width, 1 * 16}, u"AUTO_AUDIO", audio_dir, RecordView::FileType::WAV, 4096, 4); record_view->set_filename_date_frequency(true); @@ -1164,18 +1164,18 @@ size_t ReconView::change_mode(freqman_index_t new_mod) { } if (new_mod == SPEC_MODULATION) { if (persistent_memory::recon_repeat_recorded()) { - record_view = std::make_unique(Rect{0, 0, 30 * 8, 1 * 16}, + record_view = std::make_unique(Rect{0, 0, screen_width, 1 * 16}, u"RECON_REPEAT.C16", captures_dir, RecordView::FileType::RawS16, 16384, 3); record_view->set_filename_as_is(true); } else { - record_view = std::make_unique(Rect{0, 0, 30 * 8, 1 * 16}, + record_view = std::make_unique(Rect{0, 0, screen_width, 1 * 16}, u"AUTO_RAW", captures_dir, RecordView::FileType::RawS16, 16384, 3); record_view->set_filename_date_frequency(true); } } else { - record_view = std::make_unique(Rect{0, 0, 30 * 8, 1 * 16}, + record_view = std::make_unique(Rect{0, 0, screen_width, 1 * 16}, u"AUTO_AUDIO", audio_dir, RecordView::FileType::WAV, 4096, 4); record_view->set_filename_date_frequency(true); diff --git a/firmware/application/apps/ui_test.hpp b/firmware/application/apps/ui_test.hpp index c39f60773..48180ab25 100644 --- a/firmware/application/apps/ui_test.hpp +++ b/firmware/application/apps/ui_test.hpp @@ -95,10 +95,10 @@ class TestView : public View { }; Text text_debug_a{ - {0 * 8, 4 * 16, 30 * 8, 16}, + {0 * 8, 4 * 16, screen_width, 16}, "..."}; Text text_debug_b{ - {0 * 8, 5 * 16, 30 * 8, 16}, + {0 * 8, 5 * 16, screen_width, 16}, "..."}; Button button_cal{ diff --git a/firmware/application/external/analogtv/analog_tv_app.hpp b/firmware/application/external/analogtv/analog_tv_app.hpp index 21445fb09..04aadd52a 100644 --- a/firmware/application/external/analogtv/analog_tv_app.hpp +++ b/firmware/application/external/analogtv/analog_tv_app.hpp @@ -58,7 +58,7 @@ class AnalogTvView : public View { app_settings::SettingsManager settings_{ "rx_tv", app_settings::Mode::RX}; - const Rect options_view_rect{0 * 8, 1 * 16, 30 * 8, 1 * 16}; + const Rect options_view_rect{0 * 8, 1 * 16, screen_width, 1 * 16}; const Rect nbfm_view_rect{0 * 8, 1 * 16, 18 * 8, 1 * 16}; RSSI rssi{ diff --git a/firmware/application/external/debug_pmem/ui_debug_pmem.hpp b/firmware/application/external/debug_pmem/ui_debug_pmem.hpp index 0d42c99c8..f5ebedd97 100644 --- a/firmware/application/external/debug_pmem/ui_debug_pmem.hpp +++ b/firmware/application/external/debug_pmem/ui_debug_pmem.hpp @@ -44,7 +44,7 @@ class DebugDumpView : public View { NavigationView& nav_; Text dump_output{ - {0 * 8, 19 * 8, 30 * 8, 16}, + {0 * 8, 19 * 8, screen_width, 16}, ""}; Button button_exit{ diff --git a/firmware/application/external/extsensors/ui_extsensors.hpp b/firmware/application/external/extsensors/ui_extsensors.hpp index 555e576b3..f222f8a8e 100644 --- a/firmware/application/external/extsensors/ui_extsensors.hpp +++ b/firmware/application/external/extsensors/ui_extsensors.hpp @@ -60,7 +60,7 @@ class ExtSensorsView : public View { {{0 * 8, 5 * 16}, "ORI:", Theme::getInstance()->fg_light->foreground}, {{0 * 8, 7 * 16}, "ENV:", Theme::getInstance()->fg_light->foreground}}; - Text text_info{{0 * 8, 0 * 8, 30 * 8, 16 * 1}, "Connect a compatible module..."}; + Text text_info{{0 * 8, 0 * 8, screen_width, 16 * 1}, "Connect a compatible module..."}; Text text_gps{{5 * 8, 3 * 16, 24 * 8, 16}, "-"}; Text text_orientation{{5 * 8, 5 * 16, 24 * 8, 16}, "-"}; Text text_envl1{{5 * 8, 7 * 16, 24 * 8, 16}, "-"}; diff --git a/firmware/application/external/fmradio/ui_fmradio.hpp b/firmware/application/external/fmradio/ui_fmradio.hpp index f204366fd..377a613dd 100644 --- a/firmware/application/external/fmradio/ui_fmradio.hpp +++ b/firmware/application/external/fmradio/ui_fmradio.hpp @@ -103,7 +103,7 @@ class FmRadioView : public View { {21 * 8, 10, 6 * 8, 4}}; Waveform waveform{ - {0, 20, 30 * 8, 2 * 16}, + {0, 20, screen_width, 2 * 16}, audio_spectrum, 128, 0, diff --git a/firmware/application/external/lge/lge_app.hpp b/firmware/application/external/lge/lge_app.hpp index fdef3807f..2e612a7ec 100644 --- a/firmware/application/external/lge/lge_app.hpp +++ b/firmware/application/external/lge/lge_app.hpp @@ -171,7 +171,7 @@ class LGEView : public View { '0'}; Console console{ - {0, 18 * 8, 30 * 8, 7 * 16}}; + {0, 18 * 8, screen_width, 7 * 16}}; TransmitterView tx_view{ 16 * 16, diff --git a/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp b/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp index 7e9bdd653..e90139d89 100644 --- a/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp +++ b/firmware/application/external/noaaapt_rx/ui_noaaapt_rx.hpp @@ -96,7 +96,7 @@ class NoaaAptRxView : public View { nav_}; RecordView record_view{ - {0 * 8, 2 * 16, 30 * 8, 1 * 16}, + {0 * 8, 2 * 16, screen_width, 1 * 16}, u"AUD", u"AUDIO", RecordView::FileType::WAV, diff --git a/firmware/application/external/ook_editor/ui_ook_editor.hpp b/firmware/application/external/ook_editor/ui_ook_editor.hpp index 443c80896..ddcd15da6 100644 --- a/firmware/application/external/ook_editor/ui_ook_editor.hpp +++ b/firmware/application/external/ook_editor/ui_ook_editor.hpp @@ -109,7 +109,7 @@ class OOKEditorAppView : public View { Labels label_waveform{{{0, 188}, "Waveform:", Theme::getInstance()->fg_light->foreground}}; // Text field to display the various status message of the app - Text text_app_status{{0, 160, 30 * 8, 16}, ""}; + Text text_app_status{{0, 160, screen_width, 16}, ""}; // OptionsField for selectable sample rates. OptionsField field_sample_rate{{96, 20}, 7, {{"250k", 250000U}, {"1M", 1000000U}, {"2M", 2000000U}, {"5M", 5000000U}, {"10M", 10000000U}, {"20M", 20000000U}}}; @@ -121,7 +121,7 @@ class OOKEditorAppView : public View { NumberField field_repeat{{210, 40}, 3, {1, 999}, 1, '0', false}; // Text field to display the payload data. - Text text_payload{{0 * 8, 100, 30 * 8, 16}, ""}; + Text text_payload{{0 * 8, 100, screen_width, 16}, ""}; // Buttons for setting configurations, opening files, and starting transmission. Button button_set{{0, 125, 60, 28}, LanguageHelper::currentMessages[LANG_SET]}; diff --git a/firmware/application/external/remote/ui_remote.hpp b/firmware/application/external/remote/ui_remote.hpp index b269bf958..b8a7ec251 100644 --- a/firmware/application/external/remote/ui_remote.hpp +++ b/firmware/application/external/remote/ui_remote.hpp @@ -328,7 +328,7 @@ class RemoteAppView : public View { bool ready_signal_{}; // Used to signal ReplayThread ready. TextField field_title{ - {0 * 8, 0 * 16 + 2, 30 * 8, 1 * 16}, + {0 * 8, 0 * 16 + 2, screen_width, 1 * 16}, {}}; TransmitterView2 tx_view{ diff --git a/firmware/application/external/spainter/ui_spectrum_painter_image.hpp b/firmware/application/external/spainter/ui_spectrum_painter_image.hpp index a9c1bf622..2b0e2ee64 100644 --- a/firmware/application/external/spainter/ui_spectrum_painter_image.hpp +++ b/firmware/application/external/spainter/ui_spectrum_painter_image.hpp @@ -58,7 +58,7 @@ class SpectrumInputImageView : public View { uint32_t data_start{0}; Button button_load_image{ - {0 * 8, 11 * 16 - 4, 30 * 8, 28}, + {0 * 8, 11 * 16 - 4, screen_width, 28}, "Load Image ..."}; bool drawBMP_scaled(const ui::Rect r, const std::string file); diff --git a/firmware/application/external/spainter/ui_spectrum_painter_text.hpp b/firmware/application/external/spainter/ui_spectrum_painter_text.hpp index f31305d2f..f4c91a2f3 100644 --- a/firmware/application/external/spainter/ui_spectrum_painter_text.hpp +++ b/firmware/application/external/spainter/ui_spectrum_painter_text.hpp @@ -53,43 +53,43 @@ class SpectrumInputTextView : public View { void on_set_text(NavigationView& nav); Text text_message_0{ - {0 * 8, 0 * 16, 30 * 8, 16}, + {0 * 8, 0 * 16, screen_width, 16}, ""}; Text text_message_1{ - {0 * 8, 1 * 16, 30 * 8, 16}, + {0 * 8, 1 * 16, screen_width, 16}, ""}; Text text_message_2{ - {0 * 8, 2 * 16, 30 * 8, 16}, + {0 * 8, 2 * 16, screen_width, 16}, ""}; Text text_message_3{ - {0 * 8, 3 * 16, 30 * 8, 16}, + {0 * 8, 3 * 16, screen_width, 16}, ""}; Text text_message_4{ - {0 * 8, 4 * 16, 30 * 8, 16}, + {0 * 8, 4 * 16, screen_width, 16}, ""}; Text text_message_5{ - {0 * 8, 5 * 16, 30 * 8, 16}, + {0 * 8, 5 * 16, screen_width, 16}, ""}; Text text_message_6{ - {0 * 8, 6 * 16, 30 * 8, 16}, + {0 * 8, 6 * 16, screen_width, 16}, ""}; Text text_message_7{ - {0 * 8, 7 * 16, 30 * 8, 16}, + {0 * 8, 7 * 16, screen_width, 16}, ""}; Text text_message_8{ - {0 * 8, 8 * 16, 30 * 8, 16}, + {0 * 8, 8 * 16, screen_width, 16}, ""}; Text text_message_9{ - {0 * 8, 9 * 16, 30 * 8, 16}, + {0 * 8, 9 * 16, screen_width, 16}, ""}; std::array text_message{{ @@ -106,7 +106,7 @@ class SpectrumInputTextView : public View { }}; Button button_message{ - {0 * 8, 11 * 16 - 4, 30 * 8, 28}, + {0 * 8, 11 * 16 - 4, screen_width, 28}, "Set message"}; }; diff --git a/firmware/application/external/wardrivemap/ui_wardrivemap.hpp b/firmware/application/external/wardrivemap/ui_wardrivemap.hpp index 636a273d2..6d7608583 100644 --- a/firmware/application/external/wardrivemap/ui_wardrivemap.hpp +++ b/firmware/application/external/wardrivemap/ui_wardrivemap.hpp @@ -49,7 +49,7 @@ class WardriveMapView : public View { NavigationView& nav_; Text text_info{{0 * 8, 0 * 8, 20 * 8, 16 * 1}, "0 / 30"}; - Text text_notfound{{0 * 8, 0 * 8, 30 * 8, 16 * 1}, "No GeoTagged captures found"}; + Text text_notfound{{0 * 8, 0 * 8, screen_width, 16 * 1}, "No GeoTagged captures found"}; GeoPos geopos{ {0, 20}, GeoPos::alt_unit::METERS, diff --git a/firmware/application/external/wav_view/ui_view_wav.hpp b/firmware/application/external/wav_view/ui_view_wav.hpp index 7a81ba7fb..ecf62e447 100644 --- a/firmware/application/external/wav_view/ui_view_wav.hpp +++ b/firmware/application/external/wav_view/ui_view_wav.hpp @@ -129,7 +129,7 @@ class ViewWavView : public View { Theme::getInstance()->bg_darkest->foreground}; ProgressBar progressbar{ - {0 * 8, 11 * 16, 30 * 8, 4}}; + {0 * 8, 11 * 16, screen_width, 4}}; NumberField field_pos_seconds{ {9 * 8, 12 * 16}, @@ -177,7 +177,7 @@ class ViewWavView : public View { true}; Text text_delta{ - {7 * 8, 16 * 16, 30 * 8, 16}, + {7 * 8, 16 * 16, screen_width, 16}, "-"}; MessageHandlerRegistration message_handler_replay_thread_error{ diff --git a/firmware/application/ui/ui_geomap.cpp b/firmware/application/ui/ui_geomap.cpp index d2c895a64..c98f74bbe 100644 --- a/firmware/application/ui/ui_geomap.cpp +++ b/firmware/application/ui/ui_geomap.cpp @@ -42,7 +42,7 @@ GeoPos::GeoPos( const alt_unit altitude_unit, const spd_unit speed_unit) : altitude_unit_(altitude_unit), speed_unit_(speed_unit) { - set_parent_rect({pos, {30 * 8, 3 * 16}}); + set_parent_rect({pos, {screen_width, 3 * 16}}); add_children({&labels_position, &label_spd_position, diff --git a/firmware/application/ui/ui_spectrum.hpp b/firmware/application/ui/ui_spectrum.hpp index f6f6ed9e1..da5d794f4 100644 --- a/firmware/application/ui/ui_spectrum.hpp +++ b/firmware/application/ui/ui_spectrum.hpp @@ -61,7 +61,7 @@ class AudioSpectrumView : public View { ' '}; Waveform waveform{ - {0, 1 * 16 + cursor_band_height, 30 * 8, 2 * 16}, + {0, 1 * 16 + cursor_band_height, screen_width, 2 * 16}, audio_spectrum, 128, 0, @@ -150,7 +150,7 @@ class WaterfallView : public View { private: void update_widgets_rect(); - const Rect audio_spectrum_view_rect{0 * 8, 0 * 16, 30 * 8, 2 * 16 + 20}; + const Rect audio_spectrum_view_rect{0 * 8, 0 * 16, screen_width, 2 * 16 + 20}; static constexpr Dim audio_spectrum_height = 16 * 2 + 20; static constexpr Dim scale_height = 20; diff --git a/firmware/application/ui/ui_tabview.cpp b/firmware/application/ui/ui_tabview.cpp index f2348035f..9b3dc9022 100644 --- a/firmware/application/ui/ui_tabview.cpp +++ b/firmware/application/ui/ui_tabview.cpp @@ -137,7 +137,7 @@ TabView::TabView(std::initializer_list tab_definitions) { size_t tab_width = screen_width / n_tabs; - set_parent_rect({0, 0, 30 * 8, 3 * 8}); + set_parent_rect({0, 0, screen_width, 3 * 8}); for (auto& tab_definition : tab_definitions) { tabs[i].set(i, tab_width, tab_definition.text, tab_definition.color); diff --git a/firmware/application/ui/ui_transmitter.cpp b/firmware/application/ui/ui_transmitter.cpp index 4029ea15f..84b294e48 100644 --- a/firmware/application/ui/ui_transmitter.cpp +++ b/firmware/application/ui/ui_transmitter.cpp @@ -130,7 +130,7 @@ TransmitterView::TransmitterView( const uint32_t channel_bandwidth, const bool lock) : lock_{lock} { - set_parent_rect({0, y, 30 * 8, 6 * 8}); + set_parent_rect({0, y, screen_width, 6 * 8}); add_children({ &field_frequency, diff --git a/firmware/application/ui/ui_tv.hpp b/firmware/application/ui/ui_tv.hpp index a000c396b..dd94ad129 100644 --- a/firmware/application/ui/ui_tv.hpp +++ b/firmware/application/ui/ui_tv.hpp @@ -62,7 +62,7 @@ class TimeScopeView : public View { };*/ Waveform waveform{ - {0, 1 * 16 + cursor_band_height, 30 * 8, 2 * 16}, + {0, 1 * 16 + cursor_band_height, screen_width, 2 * 16}, audio_spectrum, 128, 0, @@ -117,7 +117,7 @@ class TVWidget : public View { private: void update_widgets_rect(); - const Rect audio_spectrum_view_rect{0 * 8, 0 * 16, 30 * 8, 2 * 16 + 20}; + const Rect audio_spectrum_view_rect{0 * 8, 0 * 16, screen_width, 2 * 16 + 20}; static constexpr Dim audio_spectrum_height = 16 * 2 + 20; static constexpr Dim scale_height = 20;