Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 03:23:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tune

Browse Source
This commit is contained in:
Vincent Wei
2019-03-29 12:14:19 +08:00
parent c79f09fe87
commit 215242e3e8
1 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgdi/textrunsinfo.c
+48 -9
View File
@@ -623,8 +623,7 @@ BOOL GUIAPI SetFontNameInTextRuns(TEXTRUNSINFO* runinfo,
int left_ucs;;
if (runinfo == NULL || logfont_name == NULL ||
start_index < 0 || length <= 0 ||
(start_index + length) > runinfo->nr_ucs)
start_index < 0 || start_index >= runinfo->nr_ucs)
return FALSE;
// can not change font for empty runs
@@ -635,8 +634,14 @@ BOOL GUIAPI SetFontNameInTextRuns(TEXTRUNSINFO* runinfo,
return FALSE;
}
// normalize length
if (length <= 0)
length = runinfo->nr_ucs;
if ((start_index + length) > runinfo->nr_ucs)
length = runinfo->nr_ucs - start_index;
// change the default fontname
if (start_index == 0 && length == runinfo->nr_ucs) {
if (start_index == 0 && length >= runinfo->nr_ucs) {
struct list_head* i;
// do not allow to set the same font as the default
@@ -734,12 +739,29 @@ BOOL GUIAPI SetTextColorInTextRuns(TEXTRUNSINFO* runinfo,
{
TextColorMap* color_entry = NULL;
if (runinfo == NULL || start_index < 0 || length <= 0 ||
start_index > runinfo->nr_ucs ||
(start_index + length) > runinfo->nr_ucs) {
if (runinfo == NULL ||
start_index < 0 || start_index >= runinfo->nr_ucs) {
goto error;
}
// normalize length
if (length <= 0)
length = runinfo->nr_ucs;
if ((start_index + length) > runinfo->nr_ucs)
length = runinfo->nr_ucs - start_index;
// change the default text color
if (start_index == 0 && length >= runinfo->nr_ucs) {
runinfo->fg_colors.value = color;
while (!list_empty(&runinfo->fg_colors.list)) {
TextColorMap* entry = (TextColorMap*)runinfo->fg_colors.list.prev;
list_del(runinfo->fg_colors.list.prev);
free(entry);
}
return TRUE;
}
color_entry = calloc(1, sizeof(TextColorMap));
if (color_entry == NULL) {
goto error;
@@ -778,12 +800,29 @@ BOOL GUIAPI SetBackgroundColorInTextRuns(TEXTRUNSINFO* runinfo,
{
TextColorMap* color_entry = NULL;
if (runinfo == NULL || start_index < 0 || length <= 0 ||
start_index > runinfo->nr_ucs ||
(start_index + length) > runinfo->nr_ucs) {
if (runinfo == NULL ||
start_index < 0 || start_index >= runinfo->nr_ucs) {
goto error;
}
// normalize length
if (length <= 0)
length = runinfo->nr_ucs;
if ((start_index + length) > runinfo->nr_ucs)
length = runinfo->nr_ucs - start_index;
// change the default background color
if (start_index == 0 && length >= runinfo->nr_ucs) {
runinfo->bg_colors.value = color;
while (!list_empty(&runinfo->bg_colors.list)) {
TextColorMap* entry = (TextColorMap*)runinfo->bg_colors.list.prev;
list_del(runinfo->bg_colors.list.prev);
free(entry);
}
return TRUE;
}
color_entry = calloc(1, sizeof(TextColorMap));
if (color_entry == NULL) {
goto error;