Skip to content

Commit 7365033

Browse files
ken-maxwellken-maxwell
committed
Update on 16 Dec 2022. Expand to see details.
ce29bfc63 Changed folder close and open icons to meet minimum color contrast. e2dbbc17b Fix some screen reader bugs. 0d11e8e50 Change trigger list item role to list item. 4422bffcf Adapt trigger list items to high contrast themes. db52e44d1 Adapted save button and project view to high contrast themes. 77ea007db Calculate language toggle icon position according to icon size to fix test failure. 7423ed30d Fix button focus indicator contrast bug (A11y) 503478f88 Fix some accessibility bugs. 5ada64e7a Fix bug about key focus is going to invisible list item in recent project window. 1c290b1d3 Fix some accessibility issues. b102b036d Fixed some gcc warnings. 61578dbc5 Adapt to text resize on the run. bf9cba006 Adapt font size to text scaling. e22cc5471 Fix resource view scrolling issue. b93de8dd8 Adapt view header and icon size to display resolution scaling. c1bc07fd4 Fixed some accessibility issues. e2a78a013 Fix Studio test failure caused by intentional change in generated specificati... c6766fc72 Fix the signature of the callback function generated by Studio for GX_STRING_...
1 parent 147f49f commit 7365033

9 files changed

Lines changed: 49 additions & 34 deletions

‎common/inc/gx_scroll_wheel.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* COMPONENT DEFINITION RELEASE */
2727
/* */
2828
/* gx_scroll_wheel.h PORTABLE C */
29-
/* 6.2.0 */
29+
/* 6.x */
3030
/* AUTHOR */
3131
/* */
3232
/* Kenneth Maxwell, Microsoft Corporation */
@@ -54,6 +54,10 @@
5454
/* changed prototype for */
5555
/* generic_scroll_wheel_scroll,*/
5656
/* resulting in version 6.2.0 */
57+
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
58+
/* changed return type, */
59+
/* resulting in version 6.x */
60+
/* */
5761
/**************************************************************************/
5862

5963
#ifndef GX_SCROLL_WHEEL_H
@@ -143,7 +147,7 @@ VOID _gx_generic_scroll_wheel_down_wrap(GX_GENERIC_SCROLL_WHEEL *wheel);
143147
VOID _gx_generic_scroll_wheel_draw(GX_GENERIC_SCROLL_WHEEL *wheel);
144148
UINT _gx_generic_scroll_wheel_event_process(GX_GENERIC_SCROLL_WHEEL *wheel, GX_EVENT *event_ptr);
145149
UINT _gx_generic_scroll_wheel_row_height_set(GX_GENERIC_SCROLL_WHEEL *wheel, GX_VALUE row_height);
146-
INT _gx_generic_scroll_wheel_scroll(GX_GENERIC_SCROLL_WHEEL *wheel, GX_VALUE shift);
150+
UINT _gx_generic_scroll_wheel_scroll(GX_GENERIC_SCROLL_WHEEL *wheel, GX_VALUE shift);
147151
UINT _gx_generic_scroll_wheel_total_rows_set(GX_GENERIC_SCROLL_WHEEL *wheel, INT count);
148152
VOID _gx_generic_scroll_wheel_up_wrap(GX_GENERIC_SCROLL_WHEEL *wheel);
149153
GX_BOOL _gx_generic_scroll_wheel_wrap_style_check(GX_GENERIC_SCROLL_WHEEL *wheel);

‎common/src/gx_generic_scroll_wheel_scroll.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/* FUNCTION RELEASE */
3737
/* */
3838
/* _gx_generic_scroll_wheel_scroll PORTABLE C */
39-
/* 6.2.0 */
39+
/* 6.x */
4040
/* AUTHOR */
4141
/* */
4242
/* Ting Zhu, Microsoft Corporation */
@@ -79,10 +79,13 @@
7979
/* 06-02-2021 Ting Zhu Initial Version 6.1.7 */
8080
/* 10-31-2022 Kenneth Maxwell Modified comment(s), */
8181
/* changed return type, */
82-
/* resulting in version 6.2.0 */
82+
/* resulting in version 6.2.0 */
83+
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
84+
/* changed return type, */
85+
/* resulting in version 6.x */
8386
/* */
8487
/**************************************************************************/
85-
INT _gx_generic_scroll_wheel_scroll(GX_GENERIC_SCROLL_WHEEL *wheel, GX_VALUE shift)
88+
UINT _gx_generic_scroll_wheel_scroll(GX_GENERIC_SCROLL_WHEEL *wheel, GX_VALUE shift)
8689
{
8790
GX_WIDGET *child;
8891
INT y_shift;

‎common/src/gx_system_event_dispatch.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/* FUNCTION RELEASE */
3434
/* */
3535
/* _gx_system_event_dispatch PORTABLE C */
36-
/* 6.1.11 */
36+
/* 6.x */
3737
/* AUTHOR */
3838
/* */
3939
/* Kenneth Maxwell, Microsoft Corporation */
@@ -73,13 +73,16 @@
7373
/* 04-25-2022 Ting Zhu Modified comment(s), */
7474
/* improved logic, */
7575
/* resulting in version 6.1.11 */
76+
/* xx-xx-xxxx Ting Zhu Modified comment(s), fixed */
77+
/* a gcc warning, */
78+
/* resulting in version 6.x */
7679
/* */
7780
/**************************************************************************/
7881
UINT _gx_system_event_dispatch(GX_EVENT *in_event)
7982
{
8083

8184
GX_WIDGET *target = GX_NULL;
82-
GX_WINDOW_ROOT *root_window;
85+
GX_WINDOW_ROOT *root_window = GX_NULL;
8386
GX_EVENT out_event;
8487
GX_POINT pen_pos;
8588
UINT return_code = 0;

‎common/src/gx_system_input_release.c‎

Lines changed: 19 additions & 15 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.12 */
37+
/* 6.x */
3838
/* AUTHOR */
3939
/* */
4040
/* Kenneth Maxwell, Microsoft Corporation */
@@ -74,49 +74,53 @@
7474
/* released stack entries are */
7575
/* reset to NULL, */
7676
/* resulting in version 6.1.12 */
77+
/* xx-xx-xxxx Ting Zhu Modified comment(s), */
78+
/* improved logic, */
79+
/* resulting in version 6.x */
7780
/* */
7881
/**************************************************************************/
7982

8083
UINT _gx_system_input_release(GX_WIDGET *owner)
8184
{
82-
GX_WIDGET **stacktop;
83-
GX_WIDGET **stackptr;
8485
UINT status = GX_PTR_ERROR;
86+
GX_WIDGET **stack;
87+
INT current;
88+
INT top;
8589

8690
GX_ENTER_CRITICAL
8791
if (_gx_system_capture_count > 0)
8892
{
8993
if (owner -> gx_widget_status & GX_STATUS_OWNS_INPUT)
9094
{
91-
stacktop = _gx_system_input_capture_stack + _gx_system_capture_count - 1;
92-
stackptr = _gx_system_input_capture_stack;
95+
stack = _gx_system_input_capture_stack;
96+
top = _gx_system_capture_count - 1;
97+
current = 0;
9398

94-
while (stackptr <= stacktop)
99+
while (current <= top)
95100
{
96-
if (*stackptr == owner)
101+
if (stack[current] == owner)
97102
{
98103
_gx_widget_status_remove(owner, GX_STATUS_OWNS_INPUT);
99104
_gx_system_capture_count--;
100105
status = GX_SUCCESS;
101106
break;
102107
}
103-
stackptr++;
108+
current++;
104109
}
105110

106111
if (status == GX_SUCCESS)
107112
{
108113
/* collapse the stack if this entry was in the middle */
109-
while (stackptr < stacktop)
114+
while (current < top)
110115
{
111-
*stackptr = *(stackptr + 1);
112-
stackptr++;
116+
stack[current] = stack[current + 1];
117+
current++;
113118
}
114-
*stackptr = GX_NULL;
119+
stack[current] = GX_NULL;
115120

116-
if (_gx_system_capture_count > 0)
121+
if (top > 0)
117122
{
118-
stacktop--;
119-
_gx_system_input_owner = *stacktop;
123+
_gx_system_input_owner = stack[top - 1];
120124
}
121125
else
122126
{

‎samples/demo_guix_widget_types/guix_widget_types_specifications.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/* specification file(s). For more information please refer to the Azure RTOS */
66
/* GUIX Studio User Guide, or visit our web site at azure.com/rtos */
77
/* */
8-
/* GUIX Studio Revision 6.1.12.0 */
9-
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:23 */
8+
/* GUIX Studio Revision 6.2.0.1 */
9+
/* Date (dd.mm.yyyy): 31.10.2022 Time (hh:mm): 13:53 */
1010
/*******************************************************************************/
1111

1212

‎samples/demo_guix_widget_types/guix_widget_types_specifications.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/* specification file(s). For more information please refer to the Azure RTOS */
66
/* GUIX Studio User Guide, or visit our web site at azure.com/rtos */
77
/* */
8-
/* GUIX Studio Revision 6.1.12.0 */
9-
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:23 */
8+
/* GUIX Studio Revision 6.2.0.1 */
9+
/* Date (dd.mm.yyyy): 31.10.2022 Time (hh:mm): 13:53 */
1010
/*******************************************************************************/
1111

1212

@@ -298,7 +298,7 @@ typedef struct
298298
GX_RESOURCE_ID wallpaper_id;
299299
GX_RESOURCE_ID selected_background;
300300
GX_CONST GX_RESOURCE_ID *string_id_list;
301-
UINT (*callback)(struct GX_NUMERIC_SCROLL_WHEEL_STRUCT*, INT, GX_STRING *);
301+
UINT (*callback)(struct GX_STRING_SCROLL_WHEEL_STRUCT *, INT, GX_STRING *);
302302
} GX_STRING_SCROLL_WHEEL_PROPERTIES;
303303

304304
typedef struct

‎tutorials/demo_guix_scroll_wheel/demo_guix_scroll_wheel.gxp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<header>
55
<project_version>55</project_version>
66
<guix_version>60108</guix_version>
7-
<studio_version>6010800</studio_version>
7+
<studio_version>6020001</studio_version>
88
<project_name>demo_guix_scroll_wheel</project_name>
99
<source_path>.\</source_path>
1010
<header_path>.\</header_path>
@@ -18,6 +18,7 @@
1818
<renesas_png_decoder>0</renesas_png_decoder>
1919
<grid_enabled>FALSE</grid_enabled>
2020
<snap_enabled>FALSE</snap_enabled>
21+
<snap_to_widget_enabled>FALSE</snap_to_widget_enabled>
2122
<grid_spacing>10</grid_spacing>
2223
<snap_spacing>10</snap_spacing>
2324
<gen_binary>FALSE</gen_binary>

‎tutorials/demo_guix_scroll_wheel/demo_guix_scroll_wheel_specifications.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/* specification file(s). For more information please refer to the Azure RTOS */
66
/* GUIX Studio User Guide, or visit our web site at azure.com/rtos */
77
/* */
8-
/* GUIX Studio Revision 6.1.12.0 */
9-
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */
8+
/* GUIX Studio Revision 6.2.0.1 */
9+
/* Date (dd.mm.yyyy): 31.10.2022 Time (hh:mm): 15:28 */
1010
/*******************************************************************************/
1111

1212

‎tutorials/demo_guix_scroll_wheel/demo_guix_scroll_wheel_specifications.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
/* specification file(s). For more information please refer to the Azure RTOS */
66
/* GUIX Studio User Guide, or visit our web site at azure.com/rtos */
77
/* */
8-
/* GUIX Studio Revision 6.1.12.0 */
9-
/* Date (dd.mm.yyyy): 25. 8.2022 Time (hh:mm): 18:44 */
8+
/* GUIX Studio Revision 6.2.0.1 */
9+
/* Date (dd.mm.yyyy): 31.10.2022 Time (hh:mm): 15:28 */
1010
/*******************************************************************************/
1111

1212

@@ -138,7 +138,7 @@ typedef struct
138138
GX_RESOURCE_ID wallpaper_id;
139139
GX_RESOURCE_ID selected_background;
140140
GX_CONST GX_RESOURCE_ID *string_id_list;
141-
UINT (*callback)(struct GX_NUMERIC_SCROLL_WHEEL_STRUCT*, INT, GX_STRING *);
141+
UINT (*callback)(struct GX_STRING_SCROLL_WHEEL_STRUCT *, INT, GX_STRING *);
142142
} GX_STRING_SCROLL_WHEEL_PROPERTIES;
143143

144144
typedef struct
@@ -155,7 +155,7 @@ typedef struct
155155
GX_RESOURCE_ID disabled_text_color;
156156
GX_RESOURCE_ID wallpaper_id;
157157
GX_RESOURCE_ID selected_background;
158-
UINT (*callback)(struct GX_NUMERIC_SCROLL_WHEEL_STRUCT*, INT, GX_STRING *);
158+
UINT (*callback)(struct GX_NUMERIC_SCROLL_WHEEL_STRUCT *, INT, GX_STRING *);
159159
int start_val;
160160
int end_val;
161161
} GX_NUMERIC_SCROLL_WHEEL_PROPERTIES;

0 commit comments

Comments
 (0)