Skip to content

Commit 890c37a

Browse files
yuxin-azrtosyuxin-azrtos
committed
Release 6.1.9
1 parent 8251cf1 commit 890c37a

201 files changed

Lines changed: 54012 additions & 96930 deletions

File tree

Some content is hidden

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

‎common/inc/gx_api.h‎

Lines changed: 7 additions & 4 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.8 */
27+
/* 6.1.9 */
2828
/* AUTHOR */
2929
/* */
3030
/* Kenneth Maxwell, Microsoft Corporation */
@@ -64,17 +64,20 @@
6464
/* pixelmap rotation flag */
6565
/* definitions, */
6666
/* resulting in version 6.1.5 */
67-
/* 06-02-2021 Ting Zhu Modified comment(s), */
67+
/* 06-02-2021 Ting Zhu Modified comment(s), */
6868
/* added new widget type */
6969
/* GX_GENERIC_SCROLL_WHEEL, */
7070
/* added animation delete API, */
7171
/* added generic Dave2D */
7272
/* graphics accelerator */
7373
/* support, */
7474
/* resulting in version 6.1.7 */
75-
/* 08-02-2021 Ting Zhu Modified comment(s), added */
75+
/* 08-02-2021 Ting Zhu Modified comment(s), added */
7676
/* GX_TICKS_SECOND definition */
7777
/* resulting in version 6.1.8 */
78+
/* 10-15-2021 Ting Zhu Modified comment(s), */
79+
/* updated patch number, */
80+
/* resulting in version 6.1.9 */
7881
/* */
7982
/**************************************************************************/
8083

@@ -98,7 +101,7 @@ extern "C" {
98101
#define AZURE_RTOS_GUIX
99102
#define GUIX_MAJOR_VERSION 6
100103
#define GUIX_MINOR_VERSION 1
101-
#define GUIX_PATCH_VERSION 8
104+
#define GUIX_PATCH_VERSION 9
102105

103106
/* The following symbols are defined for backward compatibility reasons.*/
104107
#define __PRODUCT_GUIX__

‎common/src/gx_circular_gauge_background_draw.c‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/* FUNCTION RELEASE */
3838
/* */
3939
/* _gx_circular_gauge_background_draw PORTABLE C */
40-
/* 6.1 */
40+
/* 6.1.9 */
4141
/* AUTHOR */
4242
/* */
4343
/* Kenneth Maxwell, Microsoft Corporation */
@@ -80,6 +80,11 @@
8080
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
8181
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
8282
/* resulting in version 6.1 */
83+
/* 10-15-2021 Kenneth Maxwell Modified comment(s), */
84+
/* fixed the order of setting */
85+
/* the display driver callback */
86+
/* and drawing the background, */
87+
/* resulting in version 6.1.9 */
8388
/* */
8489
/**************************************************************************/
8590
VOID _gx_circular_gauge_background_draw(GX_CIRCULAR_GAUGE *gauge)
@@ -94,8 +99,6 @@ GX_DRAW_CONTEXT *context = _gx_system_current_draw_context;
9499

95100
display = context -> gx_draw_context_display;
96101

97-
/* Call icon draw function to draw the background. */
98-
_gx_icon_background_draw((GX_ICON *)gauge);
99102

100103
/* Pick up gauge information. */
101104
info = &gauge -> gx_circular_gauge_info;
@@ -133,6 +136,9 @@ GX_DRAW_CONTEXT *context = _gx_system_current_draw_context;
133136
info -> gx_circular_gauge_info_needle_ypos -
134137
info -> gx_circular_gauge_info_needle_ycor;
135138
}
139+
140+
/* Call icon draw function to draw the background. */
141+
_gx_icon_background_draw((GX_ICON *)gauge);
136142

137143
if ((map != GX_NULL) && (map -> gx_pixelmap_data != GX_NULL))
138144
{

‎common/src/gx_display_driver_32bpp_pixelmap_rotate.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ VOID (*blend_func)(GX_DRAW_CONTEXT *context, INT x, INT y, GX_COLOR col
737737
/* FUNCTION RELEASE */
738738
/* */
739739
/* _gx_display_driver_32bpp_pixelmap_rotate PORTABLE C */
740-
/* 6.1 */
740+
/* 6.1.9 */
741741
/* AUTHOR */
742742
/* */
743743
/* Kenneth Maxwell, Microsoft Corporation */
@@ -783,6 +783,9 @@ VOID (*blend_func)(GX_DRAW_CONTEXT *context, INT x, INT y, GX_COLOR col
783783
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
784784
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
785785
/* resulting in version 6.1 */
786+
/* 10-15-2021 Ting Zhu Modified comment(s), */
787+
/* corrected format type, */
788+
/* resulting in version 6.1.9 */
786789
/* */
787790
/**************************************************************************/
788791
VOID _gx_display_driver_32bpp_pixelmap_rotate(GX_DRAW_CONTEXT *context, INT xpos, INT ypos, GX_PIXELMAP *pixelmap,
@@ -791,7 +794,7 @@ VOID _gx_display_driver_32bpp_pixelmap_rotate(GX_DRAW_CONTEXT *context, INT xpos
791794
switch (pixelmap -> gx_pixelmap_format)
792795
{
793796
case GX_COLOR_FORMAT_24XRGB:
794-
case GX_COLOR_FORMAT_32ABGR:
797+
case GX_COLOR_FORMAT_32ARGB:
795798
if (angle % 90 == 0)
796799
{
797800
/* Simple angle rotate: 90 degree, 180 degree and 270 degree. */

‎common/src/gx_icon_button_draw.c‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/* FUNCTION RELEASE */
3838
/* */
3939
/* _gx_icon_button_draw PORTABLE C */
40-
/* 6.1 */
40+
/* 6.1.9 */
4141
/* AUTHOR */
4242
/* */
4343
/* 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+
/* 10-15-2021 Ting Zhu Modified comment(s), */
79+
/* fixed pixelmap draw offset, */
80+
/* resulting in version 6.1.9 */
7881
/* */
7982
/**************************************************************************/
8083
VOID _gx_icon_button_draw(GX_ICON_BUTTON *button)
@@ -116,11 +119,11 @@ INT shift = 0;
116119
break;
117120

118121
case GX_STYLE_HALIGN_RIGHT:
119-
xpos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_right - map -> gx_pixelmap_width - border + shift);
122+
xpos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_right - map -> gx_pixelmap_width - border + shift + 1);
120123
break;
121124

122125
default:
123-
xpos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_left + border + shift + 1);
126+
xpos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_left + border + shift);
124127
break;
125128
}
126129

@@ -136,11 +139,11 @@ INT shift = 0;
136139
break;
137140

138141
case GX_STYLE_VALIGN_BOTTOM:
139-
ypos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_bottom - map -> gx_pixelmap_height - border + shift);
142+
ypos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_bottom - map -> gx_pixelmap_height - border + shift + 1);
140143
break;
141144

142145
default:
143-
ypos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_top + border + shift + 1);
146+
ypos = (GX_VALUE)(widget -> gx_widget_size.gx_rectangle_top + border + shift);
144147
break;
145148
}
146149
_gx_widget_context_fill_set(widget);

‎common/src/gx_sprite_draw.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/* FUNCTION RELEASE */
3939
/* */
4040
/* _gx_sprite_draw PORTABLE C */
41-
/* 6.1 */
41+
/* 6.1.9 */
4242
/* AUTHOR */
4343
/* */
4444
/* Kenneth Maxwell, Microsoft Corporation */
@@ -77,6 +77,9 @@
7777
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
7878
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
7979
/* resulting in version 6.1 */
80+
/* 10-15-2021 Ting Zhu Modified comment(s), */
81+
/* supported alphamap draw, */
82+
/* resulting in version 6.1.9 */
8083
/* */
8184
/**************************************************************************/
8285
VOID _gx_sprite_draw(GX_SPRITE *sprite)
@@ -96,6 +99,8 @@ GX_VALUE ypos;
9699
frame = &sprite -> gx_sprite_frame_list[sprite -> gx_sprite_current_frame];
97100
if (frame -> gx_sprite_frame_pixelmap)
98101
{
102+
_gx_widget_context_fill_set((GX_WIDGET *)sprite);
103+
99104
_gx_context_pixelmap_get(frame -> gx_sprite_frame_pixelmap, &map);
100105
if (map)
101106
{

‎common/src/gx_utility_bidi_paragraph_reorder.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,7 @@ GX_BIDI_ISOLATE_RUN *entry = context -> gx_bidi_context_isolate_runs;
24002400
/* FUNCTION RELEASE */
24012401
/* */
24022402
/* _gx_utility_bidi_reordering_resolve_1 PORTABLE C */
2403-
/* 6.1 */
2403+
/* 6.1.9 */
24042404
/* AUTHOR */
24052405
/* */
24062406
/* Kenneth Maxwell, Microsoft Corporation */
@@ -2435,6 +2435,9 @@ GX_BIDI_ISOLATE_RUN *entry = context -> gx_bidi_context_isolate_runs;
24352435
/* 05-19-2020 Kenneth Maxwell Initial Version 6.0 */
24362436
/* 09-30-2020 Kenneth Maxwell Modified comment(s), */
24372437
/* resulting in version 6.1 */
2438+
/* 10-15-2021 Kenneth Maxwell Modified comment(s), */
2439+
/* corrected logic, */
2440+
/* resulting in version 6.1.9 */
24382441
/* */
24392442
/**************************************************************************/
24402443
static UINT _gx_utility_bidi_reordering_resolve_1(GX_BIDI_CONTEXT *context, INT start_index, INT end_index)
@@ -2446,7 +2449,7 @@ GX_BIDI_UNIT *unit;
24462449
GX_BIDI_UNIT *pre_unit;
24472450
USHORT mirror;
24482451

2449-
for (index = start_index; index < end_index; index++)
2452+
for (index = start_index; index <= end_index; index++)
24502453
{
24512454
check_before = GX_FALSE;
24522455
unit = &context -> gx_bidi_context_unit_list[index];
@@ -2501,7 +2504,6 @@ USHORT mirror;
25012504
pre_index--;
25022505
pre_unit--;
25032506
}
2504-
break;
25052507
}
25062508

25072509
if (unit -> gx_bidi_unit_type == GX_BIDI_CHARACTER_TYPE_R &&

‎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.8 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARCv2_EM/MetaWare Version 6.1.9 *";
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.8 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARC_HS/MetaWare Version 6.1.9 *";
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.8 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARM9/AC5 Version 6.1.9 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

‎ports/arm9/gnu/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/GNU Version 6.1.8 *";
142+
"Copyright (c) Microsoft Corporation. All rights reserved. * GUIX ARM9/GNU Version 6.1.9 *";
143143
#else
144144
extern CHAR _gx_version_id[];
145145
#endif

0 commit comments

Comments
 (0)