diff --git a/test/example_internal/sl_text_input_32bpp/demo_guix_sl_text_input_32bpp.c b/test/example_internal/sl_text_input_32bpp/demo_guix_sl_text_input_32bpp.c index 6d58ee5c..e955531f 100644 --- a/test/example_internal/sl_text_input_32bpp/demo_guix_sl_text_input_32bpp.c +++ b/test/example_internal/sl_text_input_32bpp/demo_guix_sl_text_input_32bpp.c @@ -51,8 +51,8 @@ VOID demo_thread_entry(ULONG thread_input) LANGUAGE_ENGLISH, DISPLAY_1_THEME_1, &root); /* create the button screen */ - gx_studio_named_widget_create("window", (GX_WIDGET*)root, (GX_WIDGET **) &pMainScreen); - gx_studio_named_widget_create("input_focus_release_test", GX_NULL, GX_NULL); + gx_studio_named_widget_create("window", (GX_WIDGET *) root, (GX_WIDGET **) &pMainScreen); + /* Show the root window to make it and patients screen visible. */ gx_widget_show(root); diff --git a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp.gxp b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp.gxp index 9b10d406..91603c21 100644 --- a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp.gxp +++ b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp.gxp @@ -2,9 +2,9 @@
-56 +55 60103 -6030001 +6010603 sl_text_input_32bpp .\ .\ @@ -18,7 +18,6 @@ 0 FALSE FALSE -FALSE 10 10 FALSE @@ -63,7 +62,7 @@ FALSE TRUE TRUE -None +0 FALSE 1 @@ -84,7 +83,7 @@ FALSE TRUE FALSE -THEME_HEADER +4096 GROUP @@ -95,7 +94,7 @@ FALSE TRUE FALSE -COLOR_GROUP +4096 FOLDER Defaults @@ -105,7 +104,7 @@ FALSE TRUE FALSE -DEFAULT_COLOR_FOLDER +4096 COLOR CANVAS @@ -435,7 +434,7 @@ FALSE TRUE FALSE -CUSTOM_COLOR_FOLDER +4097 Add New Color @@ -456,7 +455,7 @@ FALSE TRUE FALSE -FONT_GROUP +4097 FOLDER Defaults @@ -466,7 +465,7 @@ FALSE TRUE FALSE -DEFAULT_FONT_FOLDER +4098 FONT SYSTEM @@ -482,7 +481,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -639,7 +637,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -796,7 +793,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -954,7 +950,6 @@ TRUE FALSE FALSE -FALSE TRUE 32 @@ -1106,7 +1101,7 @@ FALSE TRUE FALSE -CUSTOM_FONT_FOLDER +4099 Add New Font @@ -1132,7 +1127,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -1290,7 +1284,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -1448,7 +1441,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -1606,7 +1598,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -1764,7 +1755,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -1922,7 +1912,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -2075,7 +2064,7 @@ FALSE TRUE FALSE -PIXELMAP_GROUP +4098 FOLDER System @@ -2085,7 +2074,7 @@ FALSE TRUE FALSE -DEFAULT_PIXELMAP_FOLDER +4100 PIXELMAP RADIO_ON @@ -2099,8 +2088,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -2116,8 +2105,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -2133,8 +2122,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -2150,8 +2139,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -2164,7 +2153,7 @@ FALSE TRUE FALSE -CUSTOM_PIXELMAP_FOLDER +4101 Add New Pixelmap @@ -2185,7 +2174,7 @@ FALSE TRUE FALSE -STRING_GROUP +4099 Add New String @@ -2344,69 +2333,6 @@ default_folder window -input_focus_release_test - -0 -0 -639 -479 - - -0 -TRUE -WINDOW_FILL -WINDOW_FILL -DISABLED_FILL - -FALSE - -button -button - -184 -158 -475 -300 - - -0 -TRUE -BTN_LOWER -BTN_UPPER -DISABLED_FILL - -FALSE - -text_input -text_input - -239 -200 -402 -263 - - -0 -TRUE -CANVAS -SELECTED_FILL -DISABLED_FILL - -FALSE -STRING_1 -TEXT_INPUT -TEXT_INPUT_TEXT -SELECTED_TEXT -DISABLED_TEXT -READONLY_FILL -READONLY_TEXT -100 -FALSE - - - - -window window 5 @@ -3117,7 +3043,7 @@ FALSE TRUE FALSE -None +0 FALSE 1 @@ -3138,7 +3064,7 @@ FALSE TRUE FALSE -THEME_HEADER +4096 GROUP @@ -3149,7 +3075,7 @@ FALSE TRUE FALSE -COLOR_GROUP +4096 FOLDER Defaults @@ -3159,7 +3085,7 @@ FALSE TRUE FALSE -DEFAULT_COLOR_FOLDER +4096 COLOR CANVAS @@ -3489,7 +3415,7 @@ FALSE TRUE FALSE -CUSTOM_COLOR_FOLDER +4097 Add New Color @@ -3510,7 +3436,7 @@ FALSE TRUE FALSE -FONT_GROUP +4097 FOLDER Defaults @@ -3520,7 +3446,7 @@ FALSE TRUE FALSE -DEFAULT_FONT_FOLDER +4098 FONT SYSTEM @@ -3536,7 +3462,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -3693,7 +3618,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -3850,7 +3774,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -4007,7 +3930,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -4159,7 +4081,7 @@ FALSE TRUE FALSE -CUSTOM_FONT_FOLDER +4099 Add New Font @@ -4180,7 +4102,7 @@ FALSE TRUE FALSE -PIXELMAP_GROUP +4098 FOLDER System @@ -4190,7 +4112,7 @@ FALSE TRUE FALSE -DEFAULT_PIXELMAP_FOLDER +4100 PIXELMAP RADIO_ON @@ -4204,8 +4126,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -4221,8 +4143,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -4238,8 +4160,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -4255,8 +4177,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -4269,7 +4191,7 @@ FALSE TRUE FALSE -CUSTOM_PIXELMAP_FOLDER +4101 Add New Pixelmap @@ -4290,7 +4212,7 @@ FALSE TRUE FALSE -STRING_GROUP +4099 Add New String @@ -4344,7 +4266,7 @@ FALSE TRUE FALSE -None +0 FALSE 1 @@ -4365,7 +4287,7 @@ FALSE TRUE FALSE -THEME_HEADER +4096 GROUP @@ -4376,7 +4298,7 @@ FALSE TRUE FALSE -COLOR_GROUP +4096 FOLDER Defaults @@ -4386,7 +4308,7 @@ FALSE TRUE FALSE -DEFAULT_COLOR_FOLDER +4096 COLOR CANVAS @@ -4716,7 +4638,7 @@ FALSE TRUE FALSE -CUSTOM_COLOR_FOLDER +4097 Add New Color @@ -4737,7 +4659,7 @@ FALSE TRUE FALSE -FONT_GROUP +4097 FOLDER Defaults @@ -4747,7 +4669,7 @@ FALSE TRUE FALSE -DEFAULT_FONT_FOLDER +4098 FONT SYSTEM @@ -4763,7 +4685,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -4920,7 +4841,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -5077,7 +4997,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -5234,7 +5153,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -5386,7 +5304,7 @@ FALSE TRUE FALSE -CUSTOM_FONT_FOLDER +4099 Add New Font @@ -5407,7 +5325,7 @@ FALSE TRUE FALSE -PIXELMAP_GROUP +4098 FOLDER System @@ -5417,7 +5335,7 @@ FALSE TRUE FALSE -DEFAULT_PIXELMAP_FOLDER +4100 PIXELMAP RADIO_ON @@ -5431,8 +5349,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -5448,8 +5366,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -5465,8 +5383,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -5482,8 +5400,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -5496,7 +5414,7 @@ FALSE TRUE FALSE -CUSTOM_PIXELMAP_FOLDER +4101 Add New Pixelmap @@ -5517,7 +5435,7 @@ FALSE TRUE FALSE -STRING_GROUP +4099 Add New String @@ -5571,7 +5489,7 @@ FALSE TRUE FALSE -None +0 FALSE 1 @@ -5592,7 +5510,7 @@ FALSE TRUE FALSE -THEME_HEADER +4096 GROUP @@ -5603,7 +5521,7 @@ FALSE TRUE FALSE -COLOR_GROUP +4096 FOLDER Defaults @@ -5613,7 +5531,7 @@ FALSE TRUE FALSE -DEFAULT_COLOR_FOLDER +4096 COLOR CANVAS @@ -5943,7 +5861,7 @@ FALSE TRUE FALSE -CUSTOM_COLOR_FOLDER +4097 Add New Color @@ -5964,7 +5882,7 @@ FALSE TRUE FALSE -FONT_GROUP +4097 FOLDER Defaults @@ -5974,7 +5892,7 @@ FALSE TRUE FALSE -DEFAULT_FONT_FOLDER +4098 FONT SYSTEM @@ -5990,7 +5908,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -6147,7 +6064,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -6304,7 +6220,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -6461,7 +6376,6 @@ FALSE FALSE FALSE -FALSE TRUE 32 @@ -6613,7 +6527,7 @@ FALSE TRUE FALSE -CUSTOM_FONT_FOLDER +4099 Add New Font @@ -6634,7 +6548,7 @@ FALSE TRUE FALSE -PIXELMAP_GROUP +4098 FOLDER System @@ -6644,7 +6558,7 @@ FALSE TRUE FALSE -DEFAULT_PIXELMAP_FOLDER +4100 PIXELMAP RADIO_ON @@ -6658,8 +6572,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -6675,8 +6589,8 @@ TRUE FALSE FALSE +0 FALSE -FALSE None @@ -6692,8 +6606,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -6709,8 +6623,8 @@ FALSE FALSE FALSE +0 FALSE -FALSE None @@ -6723,7 +6637,7 @@ FALSE TRUE FALSE -CUSTOM_PIXELMAP_FOLDER +4101 Add New Pixelmap @@ -6744,7 +6658,7 @@ FALSE TRUE FALSE -STRING_GROUP +4099 Add New String diff --git a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.c b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.c index 2efec839..6ba5aba8 100644 --- a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.c +++ b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.c @@ -5,8 +5,8 @@ /* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* Studio User Guide, or visit our web site at azure.com/rtos */ /* */ -/* GUIX Studio Revision 6.3.0.1 */ -/* Date (dd.mm.yyyy): 14.12.2023 Time (hh:mm): 11:01 */ +/* GUIX Studio Revision 6.2.1.2 */ +/* Date (dd.mm.yyyy): 5. 6.2023 Time (hh:mm): 15:13 */ /*******************************************************************************/ diff --git a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.h b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.h index 102d42aa..d6f191de 100644 --- a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.h +++ b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_resources.h @@ -5,8 +5,8 @@ /* resource file(s). For more information please refer to the Azure RTOS GUIX */ /* Studio User Guide, or visit our web site at azure.com/rtos */ /* */ -/* GUIX Studio Revision 6.3.0.1 */ -/* Date (dd.mm.yyyy): 14.12.2023 Time (hh:mm): 11:01 */ +/* GUIX Studio Revision 6.1.12.0 */ +/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:42 */ /*******************************************************************************/ diff --git a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.c b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.c index c0ba9040..61785a2b 100644 --- a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.c +++ b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.c @@ -5,8 +5,8 @@ /* specification file(s). For more information please refer to the Azure RTOS */ /* GUIX Studio User Guide, or visit our web site at azure.com/rtos */ /* */ -/* GUIX Studio Revision 6.3.0.1 */ -/* Date (dd.mm.yyyy): 14.12.2023 Time (hh:mm): 11:01 */ +/* GUIX Studio Revision 6.2.0.1 */ +/* Date (dd.mm.yyyy): 31.10.2022 Time (hh:mm): 14:11 */ /*******************************************************************************/ @@ -16,7 +16,6 @@ #include "sl_text_input_32bpp_specifications.h" static GX_WIDGET *gx_studio_nested_widget_create(GX_BYTE *control, GX_CONST GX_STUDIO_WIDGET *definition, GX_WIDGET *parent); -INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK input_focus_release_test; WINDOW_CONTROL_BLOCK window; GX_DISPLAY display_1_control_block; GX_WINDOW_ROOT display_1_root_window; @@ -48,14 +47,6 @@ GX_STUDIO_DISPLAY_INFO sl_text_input_32bpp_display_table[1] = }; -UINT gx_studio_button_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *control_block, GX_WIDGET *parent) -{ - UINT status; - GX_BUTTON *button = (GX_BUTTON *) control_block; - status = gx_button_create(button, info->widget_name, parent, info->style, info->widget_id, &info->size); - return status; -} - UINT gx_studio_checkbox_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *control_block, GX_WIDGET *parent) { UINT status; @@ -179,95 +170,6 @@ UINT gx_studio_text_input_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *con } return status; } -GX_WINDOW_PROPERTIES input_focus_release_test_properties = -{ - 0 /* wallpaper pixelmap id */ -}; -GX_CHAR input_focus_release_test_text_input_buffer[100]; -GX_SINGLE_LINE_TEXT_INPUT_PROPERTIES input_focus_release_test_text_input_properties = -{ - GX_STRING_ID_STRING_1, /* string id */ - GX_FONT_ID_TEXT_INPUT, /* font id */ - GX_COLOR_ID_TEXT_INPUT_TEXT, /* normal text color */ - GX_COLOR_ID_SELECTED_TEXT, /* selected text color */ - GX_COLOR_ID_DISABLED_TEXT, /* disabled text color */ - GX_COLOR_ID_READONLY_FILL, /* readonly fill color */ - GX_COLOR_ID_READONLY_TEXT, /* readonly text color */ - input_focus_release_test_text_input_buffer, /* buffer */ - 100, /* buffer size */ -}; - -GX_CONST GX_STUDIO_WIDGET input_focus_release_test_text_input_define = -{ - "text_input", - GX_TYPE_SINGLE_LINE_TEXT_INPUT, /* widget type */ - GX_ID_NONE, /* widget id */ - #if defined(GX_WIDGET_USER_DATA) - 0, /* user data */ - #endif - GX_STYLE_BORDER_RECESSED|GX_STYLE_ENABLED|GX_STYLE_TEXT_LEFT, /* style flags */ - GX_STATUS_ACCEPTS_FOCUS, /* status flags */ - sizeof(GX_SINGLE_LINE_TEXT_INPUT), /* control block size */ - GX_COLOR_ID_CANVAS, /* normal color id */ - GX_COLOR_ID_SELECTED_FILL, /* selected color id */ - GX_COLOR_ID_DISABLED_FILL, /* disabled color id */ - gx_studio_text_input_create, /* create function */ - GX_NULL, /* drawing function override */ - GX_NULL, /* event function override */ - {239, 200, 402, 263}, /* widget size */ - GX_NULL, /* no next widget */ - GX_NULL, /* no child widgets */ - offsetof(INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK, input_focus_release_test_text_input), /* control block */ - (void *) &input_focus_release_test_text_input_properties /* extended properties */ -}; - -GX_CONST GX_STUDIO_WIDGET input_focus_release_test_button_define = -{ - "button", - GX_TYPE_BUTTON, /* widget type */ - GX_ID_NONE, /* widget id */ - #if defined(GX_WIDGET_USER_DATA) - 0, /* user data */ - #endif - GX_STYLE_BORDER_RAISED|GX_STYLE_ENABLED, /* style flags */ - GX_STATUS_ACCEPTS_FOCUS, /* status flags */ - sizeof(GX_BUTTON), /* control block size */ - GX_COLOR_ID_BTN_LOWER, /* normal color id */ - GX_COLOR_ID_BTN_UPPER, /* selected color id */ - GX_COLOR_ID_DISABLED_FILL, /* disabled color id */ - gx_studio_button_create, /* create function */ - GX_NULL, /* drawing function override */ - GX_NULL, /* event function override */ - {184, 158, 475, 300}, /* widget size */ - GX_NULL, /* no next widget */ - &input_focus_release_test_text_input_define, /* child widget definition */ - offsetof(INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK, input_focus_release_test_button), /* control block */ - (void *) GX_NULL /* no extended properties */ -}; - -GX_CONST GX_STUDIO_WIDGET input_focus_release_test_define = -{ - "input_focus_release_test", - GX_TYPE_WINDOW, /* widget type */ - GX_ID_NONE, /* widget id */ - #if defined(GX_WIDGET_USER_DATA) - 0, /* user data */ - #endif - GX_STYLE_BORDER_THIN|GX_STYLE_ENABLED, /* style flags */ - GX_STATUS_ACCEPTS_FOCUS, /* status flags */ - sizeof(INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK), /* control block size */ - GX_COLOR_ID_WINDOW_FILL, /* normal color id */ - GX_COLOR_ID_WINDOW_FILL, /* selected color id */ - GX_COLOR_ID_DISABLED_FILL, /* disabled color id */ - gx_studio_window_create, /* create function */ - GX_NULL, /* drawing function override */ - GX_NULL, /* event function override */ - {0, 0, 639, 479}, /* widget size */ - GX_NULL, /* next widget */ - &input_focus_release_test_button_define, /* child widget */ - 0, /* control block */ - (void *) &input_focus_release_test_properties /* extended properties */ -}; GX_WINDOW_PROPERTIES window_properties = { 0 /* wallpaper pixelmap id */ @@ -1249,7 +1151,6 @@ GX_CONST GX_STUDIO_WIDGET window_define = }; GX_CONST GX_STUDIO_WIDGET_ENTRY sl_text_input_32bpp_widget_table[] = { - { &input_focus_release_test_define, (GX_WIDGET *) &input_focus_release_test }, { &window_define, (GX_WIDGET *) &window }, {GX_NULL, GX_NULL} }; diff --git a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.h b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.h index 8e26e97b..eb5a0652 100644 --- a/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.h +++ b/test/example_internal/sl_text_input_32bpp/sl_text_input_32bpp_specifications.h @@ -5,8 +5,8 @@ /* specification file(s). For more information please refer to the Azure RTOS */ /* GUIX Studio User Guide, or visit our web site at azure.com/rtos */ /* */ -/* GUIX Studio Revision 6.3.0.1 */ -/* Date (dd.mm.yyyy): 14.12.2023 Time (hh:mm): 11:01 */ +/* GUIX Studio Revision 6.2.0.1 */ +/* Date (dd.mm.yyyy): 31.10.2022 Time (hh:mm): 14:11 */ /*******************************************************************************/ @@ -138,13 +138,6 @@ typedef struct /* Declare top-level control blocks */ -typedef struct INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK_STRUCT -{ - GX_WINDOW_MEMBERS_DECLARE - GX_BUTTON input_focus_release_test_button; - GX_SINGLE_LINE_TEXT_INPUT input_focus_release_test_text_input; -} INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK; - typedef struct WINDOW_CONTROL_BLOCK_STRUCT { GX_WINDOW_MEMBERS_DECLARE @@ -182,7 +175,6 @@ typedef struct WINDOW_CONTROL_BLOCK_STRUCT /* extern statically defined control blocks */ #ifndef GUIX_STUDIO_GENERATED_FILE -extern INPUT_FOCUS_RELEASE_TEST_CONTROL_BLOCK input_focus_release_test; extern WINDOW_CONTROL_BLOCK window; #endif @@ -215,7 +207,6 @@ typedef struct GX_STUDIO_DISPLAY_INFO_STRUCT /* Declare Studio-generated functions for creating top-level widgets */ -UINT gx_studio_button_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *control_block, GX_WIDGET *parent); UINT gx_studio_checkbox_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *control_block, GX_WIDGET *parent); UINT gx_studio_radio_button_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *control_block, GX_WIDGET *parent); UINT gx_studio_prompt_create(GX_CONST GX_STUDIO_WIDGET *info, GX_WIDGET *control_block, GX_WIDGET *parent);