- Added initial version of Hierarchical Menu

- Beautified the Message Box a bit
This commit is contained in:
2025-09-19 15:21:15 +02:00
parent 097a50f073
commit c8f14373d3
36 changed files with 2998 additions and 1973 deletions

View File

@@ -9,10 +9,11 @@
// Includes
#include "../Screens.h"
#include "../UI_Control.h"
#include "../Display_Default_Configurations.h"
#include "../Hierarchical_Menu.h"
#include "../Display.h"
#include "../Display_Objects.h"
#include "../Display_Default_Configurations.h"
// ============================================================================================
@@ -21,16 +22,25 @@
// ============================================================================================
// Variables
static void (*_Return_Function)(Screen_Transition_Direction, Screen_Transition_Direction, Easing, uint32_t, int32_t);
static int32_t _Return_Value;
static Object_ID _Object_Message_Box;
static const Hierarchical_Menu* _Return_Menu = NULL;
static const Menu_List* _Return_List = NULL;
static int32_t _Return_Selected_Item;
static char* _Title;
static uint32_t _Title_Length;
static uint8_t* _Value;
static bool _Bool_Value;
static bool _Bool_Value;
static bool _Decision_Made;
static uint32_t _Counter;
// ============================================================================================
// Function Declarations
void Screen_Setup_Select_Bool(Screen_Transition_Direction direction_out, Screen_Transition_Direction direction_in, Easing type, uint32_t frame_duration, char* title, uint32_t title_length, uint8_t *value, void (*return_function)(Screen_Transition_Direction, Screen_Transition_Direction, Easing, uint32_t, int32_t), int32_t return_value);
void Screen_Setup_Select_Bool(Screen_Transition_Direction direction_out, Screen_Transition_Direction direction_in, Easing type, uint32_t frame_duration, char* title, uint32_t title_length, uint8_t *value, const Hierarchical_Menu* return_menu, const Menu_List* return_list, int32_t return_selected_item);
static void Screen_Init (Screen_Transition_Direction direction_out, Screen_Transition_Direction direction_in, Easing type, uint32_t frame_duration);
static void Screen_Tick (void);
static void Screen_Click (uint button_return_value);
static void Screen_Touch_Event (int16_t x, int16_t y);
@@ -45,9 +55,26 @@ static void Screen_On_Object_Deselect (Object_ID object_id);
/*******************************************************************
Functions
*******************************************************************/
void Screen_Setup_Select_Bool(Screen_Transition_Direction direction_out, Screen_Transition_Direction direction_in, Easing type, uint32_t frame_duration, char* title, uint32_t title_length, uint8_t *value, void (*return_function)(Screen_Transition_Direction, Screen_Transition_Direction, Easing, uint32_t, int32_t), int32_t return_value)
void Screen_Setup_Select_Bool(Screen_Transition_Direction direction_out, Screen_Transition_Direction direction_in, Easing type, uint32_t frame_duration, char* title, uint32_t title_length, uint8_t *value, const Hierarchical_Menu* return_menu, const Menu_List* return_list, int32_t return_selected_item)
{
_Screen_Tick = Screen_Tick;
_Title = title;
_Title_Length = title_length;
_Value = value;
_Bool_Value = (*_Value) > 0;
Screen_Init(direction_out, direction_in, type, frame_duration);
_Return_Menu = return_menu;
_Return_List = return_list;
_Return_Selected_Item = return_selected_item;
_Decision_Made = false;
_Counter = 0;
}
void Screen_Init(Screen_Transition_Direction direction_out, Screen_Transition_Direction direction_in, Easing type, uint32_t frame_duration)
{
_Screen_Tick = Screen_Tick;
_Screen_Click = Screen_Click;
_Screen_Touch_Event = Screen_Touch_Event;
_Screen_Action_CW = Screen_Action_CW;
@@ -61,23 +88,24 @@ void Screen_Setup_Select_Bool(Screen_Transition_Direction direction_out, Screen_
Display_Screen_Transition_Start(direction_out, direction_in, type, frame_duration);
//////////////////////////////
//////////////////////////////
// Add Display Objects here //
//////////////////////////////
_Return_Function = return_function;
_Return_Value = return_value;
_Value = value;
_Bool_Value = (*_Value) > 0;
Display_Objects_Add_Select_YesNo(title, title_length, &_Bool_Value, &_Configuration_Default_Select_YesNo);
Display_Objects_Add_Select_YesNo(_Title, _Title_Length, &_Bool_Value, &_Configuration_Default_Select_YesNo);
_Object_Message_Box = Display_Objects_Add_Message_Box(CENTER_MIDDLE, BOTH_IN_PERCENT, 50, 50, "Saved", MESSAGE_BOX_ICON_CIRCLE_CHECKMARK, &_Message_Box_Style_Regular);
Display_Select_Object();
}
void Screen_Tick(void)
{
if(_Decision_Made) {
_Counter++;
}
if(_Counter == MESSAGE_BOX_DEFAULT_TICKS) {
Screen_Setup_Settings_Hierarchical_Menu(TRANSITION_DOWN, TRANSITION_RIGHT, SCREEN_TRANSITION_DEFAULT_EASING, SCREEN_TRANSITION_DEFAULT_FRAMES, _Return_Menu, _Return_List, _Return_Selected_Item);
}
}
void Screen_Click(uint button_return_value)
@@ -92,7 +120,11 @@ void Screen_Touch_Event(int16_t x, int16_t y)
void Screen_Action_CW(Object_ID object_id)
{
(*_Value) ^= 0x01;
if(_Decision_Made) {
return;
}
(*_Value) ^= 0x01;
_Bool_Value = (*_Value) > 0;
}
@@ -119,7 +151,10 @@ void Screen_On_Object_Select(Object_ID object_id)
void Screen_On_Object_Deselect(Object_ID object_id)
{
_Return_Function(TRANSITION_DOWN, TRANSITION_DOWN, SCREEN_TRANSITION_DEFAULT_EASING, SCREEN_TRANSITION_DEFAULT_FRAMES, _Return_Value);
if(!_Decision_Made) {
Display_Objects_Show_Message_Box(_Object_Message_Box, MESSAGE_BOX_DEFAULT_TICKS);
_Decision_Made = true;
}
}