Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

WebView: fix parsetag

Browse Source 
@menu: better contrast for skins with sc.work equal to 0x000000

git-svn-id: svn://kolibrios.org@7935 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-05-16 22:01:17 +00:00
parent ffdb75ee7f
commit 43c32e08ff
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/cmm/TWB/parse_tag.h
View File

@ -97,7 +97,6 @@ bool _tag::get_next_param()
//find ATTR start and copy //find ATTR start and copy
while (i>0) && (!__isWhite(params[i])) i--; while (i>0) && (!__isWhite(params[i])) i--;
strlcpy(#attr, #params + i + 1, sizeof(attr)-1); strlcpy(#attr, #params + i + 1, sizeof(attr)-1);
strlwr(#attr);
params[i] = '\0'; params[i] = '\0';
//fix case: src=./images/KolibriOS_logo2.jpg?sid=e8ece8b38b //fix case: src=./images/KolibriOS_logo2.jpg?sid=e8ece8b38b
@ -106,6 +105,7 @@ bool _tag::get_next_param()
strlcpy(#val, i+1, sizeof(val)-1); strlcpy(#val, i+1, sizeof(val)-1);
ESBYTE[i+1] = '\0'; ESBYTE[i+1] = '\0';
} }
strlwr(#attr);
attributes.add(#attr); attributes.add(#attr);
values.add(#val); values.add(#val);

2
programs/cmm/browser/texts.h
View File

@ -1,4 +1,4 @@
char version[]="WebView 2.5"; char version[]="WebView 2.5b";
#ifdef LANG_RUS #ifdef LANG_RUS
char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0"; char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";

4
programs/cmm/quark/prepare_page.h
View File

@ -51,7 +51,7 @@ void PaintVisible()
dword line_bg; dword line_bg;
bool swapped_selection = false; bool swapped_selection = false;
list.column_max = lines.get(list.cur_y+1) - lines.get(list.cur_y); list.column_max = lines.len(list.cur_y);
list.CheckDoesValuesOkey(); list.CheckDoesValuesOkey();
if (selection.end_offset < selection.start_offset) { if (selection.end_offset < selection.start_offset) {
swapped_selection = selection.swap_start_end(); swapped_selection = selection.swap_start_end();
@ -69,7 +69,7 @@ void PaintVisible()
selection.draw(absolute_y); selection.draw(absolute_y);
if (absolute_y<list.count) DrawBuf.WriteText(3, ydraw+3, list.font_type, theme.text, if (absolute_y<list.count) DrawBuf.WriteText(3, ydraw+3, list.font_type, theme.text,
lines.get(absolute_y), lines.get(absolute_y+1) - lines.get(absolute_y)); lines.get(absolute_y), lines.len(absolute_y));
} }
PutPaletteImage(buf_data+8, DrawBuf.bufw, list.h, list.x, list.y, 32, 0); PutPaletteImage(buf_data+8, DrawBuf.bufw, list.h, list.x, list.y, 32, 0);

4
programs/system/menu/trunk/menu.asm
View File

@ -841,6 +841,10 @@ nocorrect:
inc dl inc dl
cmp [edi + cur_sel],dl cmp [edi + cur_sel],dl
jne .nohighlight jne .nohighlight
cmp esi,0
jne @f
mov esi,0x2a2a2a
@@:
add esi,0x1a1a1a add esi,0x1a1a1a
;-------------------------------------- ;--------------------------------------
align 4 align 4