From 3e6bbe5e47d201d60ccb4ebeb39789f80be90c8f Mon Sep 17 00:00:00 2001 From: "Jasper v. Blanckenburg" Date: Mon, 22 May 2023 07:25:32 +0200 Subject: [PATCH] Resize field type selection to fit screen --- .../gui_generated/driverview_screen/DriverViewViewBase.hpp | 2 +- .../src/driverview_screen/DriverViewViewBase.cpp | 4 ++-- TouchGFX/steering-wheel.touchgfx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp b/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp index 5877361..9c4f91a 100644 --- a/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp +++ b/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp @@ -98,7 +98,7 @@ protected: touchgfx::TextArea brakeLabel; touchgfx::Container dataFields; touchgfx::ScrollWheel fieldTypeSelection; - touchgfx::DrawableListItems fieldTypeSelectionListItems; + touchgfx::DrawableListItems fieldTypeSelectionListItems; DriverViewField field3; DriverViewField field2; DriverViewField field1; diff --git a/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp b/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp index 153dd2b..9ffad03 100644 --- a/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp +++ b/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp @@ -138,8 +138,8 @@ DriverViewViewBase::DriverViewViewBase() : add(brakeTemps); - dataFields.setPosition(15, 48, 450, 305); - fieldTypeSelection.setPosition(0, 80, 150, 225); + dataFields.setPosition(15, 48, 450, 257); + fieldTypeSelection.setPosition(0, 80, 150, 177); fieldTypeSelection.setHorizontal(false); fieldTypeSelection.setCircular(true); fieldTypeSelection.setEasingEquation(touchgfx::EasingEquations::linearEaseOut); diff --git a/TouchGFX/steering-wheel.touchgfx b/TouchGFX/steering-wheel.touchgfx index 7524b6a..c12b25a 100644 --- a/TouchGFX/steering-wheel.touchgfx +++ b/TouchGFX/steering-wheel.touchgfx @@ -516,14 +516,14 @@ "X": 15, "Y": 48, "Width": 450, - "Height": 305, + "Height": 257, "Components": [ { "Type": "ScrollWheel", "Name": "fieldTypeSelection", "Y": 80, "Width": 150, - "Height": 225, + "Height": 177, "Visible": false, "SelectedItemOffset": 94, "IsCircular": true,