Skip to content

Commit cec32ac

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.12
1 parent 3cc40b6 commit cec32ac

File tree

59 files changed

+119
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+119
-80
lines changed

‎common/inc/gx_api.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/* APPLICATION INTERFACE DEFINITION RELEASE */
2525
/* */
2626
/* gx_api.h PORTABLE C */
27-
/* 6.1.11 */
27+
/* 6.1.12 */
2828
/* AUTHOR */
2929
/* */
3030
/* Kenneth Maxwell, Microsoft Corporation */
@@ -92,6 +92,10 @@
9292
/* added new animation flag */
9393
/* GX_ANIMATION_BLOCK_MOVE, */
9494
/* resulting in version 6.1.11 */
95+
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
96+
/* added new style */
97+
/* GX_STYLE_REPEAT_SELECT, */
98+
/* resulting in version 6.1.12 */
9599
/* */
96100
/**************************************************************************/
97101

@@ -115,7 +119,7 @@ extern "C" {
115119
#define AZURE_RTOS_GUIX
116120
#define GUIX_MAJOR_VERSION 6
117121
#define GUIX_MINOR_VERSION 1
118-
#define GUIX_PATCH_VERSION 11
122+
#define GUIX_PATCH_VERSION 12
119123

120124
/* The following symbols are defined for backward compatibility reasons.*/
121125
#define __PRODUCT_GUIX__
@@ -799,6 +803,7 @@ typedef struct GX_STRING_STRUCT
799803
#define GX_STYLE_CENTER_SELECTED 0x00000010UL
800804
#define GX_STYLE_WRAP 0x00000020UL
801805
#define GX_STYLE_FLICKABLE 0x00000040UL
806+
#define GX_STYLE_REPEAT_SELECT 0x00000080UL
802807

803808

804809
/* Define Icon, Pixelmap button and Icon button alignment flags. */

‎common/src/gx_display_driver_32argb_pixelmap_draw.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
123123
/* */
124124
/* _gx_display_driver_32xrgb_pixelmap_compressed_alpha_write */
125125
/* PORTABLE C */
126-
/* 6.1 */
126+
/* 6.1.12 */
127127
/* AUTHOR */
128128
/* */
129129
/* Kenneth Maxwell, Microsoft Corporation */
@@ -161,6 +161,8 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
161161
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
162162
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
163163
/* resulting in version 6.1 */
164+
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
165+
/* resulting in version 6.1.12 */
164166
/* */
165167
/**************************************************************************/
166168
static VOID _gx_display_driver_32argb_pixelmap_compressed_alpha_write(GX_DRAW_CONTEXT *context,
@@ -205,7 +207,7 @@ GX_RECTANGLE *clip = context -> gx_draw_context_clip;
205207
}
206208

207209
/* now we are on the first visible row, copy pixels until we get
208-
to the enf of the last visible row
210+
to the end of the last visible row
209211
*/
210212

211213
while (yval <= clip -> gx_rectangle_bottom)

‎common/src/gx_horizontal_list_event_process.c‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/* FUNCTION RELEASE */
3838
/* */
3939
/* _gx_horizontal_list_event_process PORTABLE C */
40-
/* 6.1 */
40+
/* 6.1.12 */
4141
/* AUTHOR */
4242
/* */
4343
/* Kenneth Maxwell, Microsoft Corporation */
@@ -90,6 +90,10 @@
9090
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
9191
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
9292
/* resulting in version 6.1 */
93+
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
94+
/* fixed bug in EVENT_PEN_DRAG */
95+
/* handler, */
96+
/* resulting in version 6.1.12 */
9397
/* */
9498
/**************************************************************************/
9599
UINT _gx_horizontal_list_event_process(GX_HORIZONTAL_LIST *list, GX_EVENT *event_ptr)
@@ -104,6 +108,8 @@ INT list_width;
104108
INT widget_width;
105109
INT new_pen_index;
106110
GX_WIDGET **stackptr;
111+
GX_WIDGET **stacktop;
112+
107113
GX_EVENT input_release_event;
108114

109115
switch (event_ptr -> gx_event_type)
@@ -222,19 +228,21 @@ GX_EVENT input_release_event;
222228
{
223229
/* Start sliding, remove other widgets from input capture stack. */
224230
stackptr = _gx_system_input_capture_stack;
231+
stacktop = _gx_system_input_capture_stack + _gx_system_capture_count;
232+
225233
memset(&input_release_event, 0, sizeof(GX_EVENT));
226234
input_release_event.gx_event_type = GX_EVENT_INPUT_RELEASE;
227235

228-
while (*stackptr)
236+
while (stackptr < stacktop)
229237
{
230-
if (*stackptr != widget)
238+
if (*stackptr != GX_NULL && *stackptr != widget)
231239
{
232240
input_release_event.gx_event_target = *stackptr;
233241
_gx_system_event_send(&input_release_event);
234242
}
235243
stackptr++;
236244
}
237-
245+
238246
_gx_horizontal_list_scroll(list,
239247
event_ptr -> gx_event_payload.gx_event_pointdata.gx_point_x -
240248
list -> gx_window_move_start.gx_point_x);

‎common/src/gx_horizontal_list_selected_set.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _gx_horizontal_list_selected_set PORTABLE C */
38-
/* 6.1 */
38+
/* 6.1.12 */
3939
/* AUTHOR */
4040
/* */
4141
/* Kenneth Maxwell, Microsoft Corporation */
@@ -74,6 +74,10 @@
7474
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
7575
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
7676
/* resulting in version 6.1 */
77+
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
78+
/* added support for */
79+
/* GX_STYLE_REPEAT_SELECT, */
80+
/* resulting in version 6.1.12 */
7781
/* */
7882
/**************************************************************************/
7983

@@ -87,7 +91,10 @@ INT right_index;
8791

8892
if (horizontal_list -> gx_horizontal_list_selected == index)
8993
{
90-
return GX_SUCCESS;
94+
if ((horizontal_list -> gx_widget_style & GX_STYLE_REPEAT_SELECT) == 0)
95+
{
96+
return GX_SUCCESS;
97+
}
9198
}
9299

93100
if (index < 0)

‎common/src/gx_system_input_release.c‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/* FUNCTION RELEASE */
3535
/* */
3636
/* _gx_system_input_release PORTABLE C */
37-
/* 6.1 */
37+
/* 6.1.12 */
3838
/* AUTHOR */
3939
/* */
4040
/* Kenneth Maxwell, Microsoft Corporation */
@@ -69,6 +69,11 @@
6969
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
7070
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
7171
/* resulting in version 6.1 */
72+
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
73+
/* optimized logic and ensured */
74+
/* released stack entries are */
75+
/* reset to NULL, */
76+
/* resulting in version 6.1.12 */
7277
/* */
7378
/**************************************************************************/
7479

@@ -92,7 +97,6 @@ UINT status = GX_PTR_ERROR;
9297
{
9398
_gx_widget_status_remove(owner, GX_STATUS_OWNS_INPUT);
9499
_gx_system_capture_count--;
95-
*stackptr = GX_NULL;
96100
status = GX_SUCCESS;
97101
break;
98102
}
@@ -102,14 +106,13 @@ UINT status = GX_PTR_ERROR;
102106
if (status == GX_SUCCESS)
103107
{
104108
/* collapse the stack if this entry was in the middle */
105-
if (stackptr < stacktop)
109+
while (stackptr < stacktop)
106110
{
107-
while (stackptr < stacktop)
108-
{
109-
*stackptr = *(stackptr + 1);
110-
stackptr++;
111-
}
111+
*stackptr = *(stackptr + 1);
112+
stackptr++;
112113
}
114+
*stackptr = GX_NULL;
115+
113116
if (_gx_system_capture_count > 0)
114117
{
115118
stacktop--;

‎common/src/gx_vertical_list_event_process.c‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _gx_vertical_list_event_process PORTABLE C */
38-
/* 6.1 */
38+
/* 6.1.12 */
3939
/* AUTHOR */
4040
/* */
4141
/* Kenneth Maxwell, Microsoft Corporation */
@@ -86,6 +86,10 @@
8686
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
8787
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
8888
/* resulting in version 6.1 */
89+
/* 07-29-2022 Kenneth Maxwell Modified comment(s), */
90+
/* fixed bug in EVENT_PEN_DRAG */
91+
/* handler, */
92+
/* resulting in version 6.1.12 */
8993
/* */
9094
/**************************************************************************/
9195
UINT _gx_vertical_list_event_process(GX_VERTICAL_LIST *list, GX_EVENT *event_ptr)
@@ -100,6 +104,7 @@ INT list_height;
100104
INT widget_height;
101105
INT new_pen_index;
102106
GX_WIDGET **stackptr;
107+
GX_WIDGET **stacktop;
103108
GX_EVENT input_release_event;
104109

105110
switch (event_ptr -> gx_event_type)
@@ -219,12 +224,14 @@ GX_EVENT input_release_event;
219224
{
220225
/* Start sliding, remove other widgets from input capture stack. */
221226
stackptr = _gx_system_input_capture_stack;
227+
stacktop = _gx_system_input_capture_stack + _gx_system_capture_count;
228+
222229
memset(&input_release_event, 0, sizeof(GX_EVENT));
223230
input_release_event.gx_event_type = GX_EVENT_INPUT_RELEASE;
224231

225-
while (*stackptr)
232+
while (stackptr < stacktop)
226233
{
227-
if (*stackptr != widget)
234+
if (*stackptr != GX_NULL && *stackptr != widget)
228235
{
229236
input_release_event.gx_event_target = *stackptr;
230237
_gx_system_event_send(&input_release_event);

‎common/src/gx_vertical_list_selected_set.c‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _gx_vertical_list_selected_set PORTABLE C */
38-
/* 6.1 */
38+
/* 6.1.12 */
3939
/* AUTHOR */
4040
/* */
4141
/* Kenneth Maxwell, Microsoft Corporation */
@@ -75,6 +75,9 @@
7575
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
7676
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
7777
/* resulting in version 6.1 */
78+
/* 07-29-2022 Kenneth Maxwell Added support for GX_STYLE_ */
79+
/* REPEAT_SELECT, */
80+
/* resulting in version 6.1.12 */
7881
/* */
7982
/**************************************************************************/
8083
UINT _gx_vertical_list_selected_set(GX_VERTICAL_LIST *vertical_list, INT index)
@@ -85,9 +88,12 @@ INT page_index = vertical_list -> gx_vertical_list_top_index;
8588
INT top_index;
8689
INT bottom_index;
8790

88-
if (vertical_list -> gx_vertical_list_selected == index)
91+
if (vertical_list -> gx_vertical_list_selected == index)
8992
{
90-
return GX_SUCCESS;
93+
if ((vertical_list -> gx_widget_style & GX_STYLE_REPEAT_SELECT) == 0)
94+
{
95+
return GX_SUCCESS;
96+
}
9197
}
9298

9399
if (index < 0)

‎ports/arc_em/metaware/inc/gx_port.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ typedef SHORT GX_VALUE;
139139

140140
#ifdef GX_SYSTEM_INIT
141141
CHAR _gx_version_id[] =
142-
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARCv2_EM/MetaWare Version 6.1.11 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARCv2_EM/MetaWare Version 6.1.12 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

‎ports/arc_hs/metaware/inc/gx_port.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ typedef SHORT GX_VALUE;
139139

140140
#ifdef GX_SYSTEM_INIT
141141
CHAR _gx_version_id[] =
142-
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARC_HS/MetaWare Version 6.1.11 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARC_HS/MetaWare Version 6.1.12 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

‎ports/arm9/ac5/inc/gx_port.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ typedef SHORT GX_VALUE;
139139

140140
#ifdef GX_SYSTEM_INIT
141141
CHAR _gx_version_id[] =
142-
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARM9/AC5 Version 6.1.11 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARM9/AC5 Version 6.1.12 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

0 commit comments

Comments
 (0)