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

Fix bug with links in h tags and symbols width

Browse Source 
git-svn-id: svn://kolibrios.org@6372 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
cheptil 2016-03-24 19:13:24 +00:00
parent 7c423903ff
commit 878255817e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
programs/cmm/aelia/prepare_page.h
View File

@ -77,7 +77,7 @@ void ParceHtml(byte draw)
dword DOM_start, DOM_end, DOM_len, DOM_pos; dword DOM_start, DOM_end, DOM_len, DOM_pos;
int stroka_x = HTML_PADDING_X; int stroka_x = HTML_PADDING_X;
int stroka_y = HTML_PADDING_Y; int stroka_y = HTML_PADDING_Y;
int size_pt_change; int size_pt_change = 0;
dword line_break; dword line_break;
byte ch, zeroch; byte ch, zeroch;
_text text; _text text;
@ -119,7 +119,7 @@ _tag tag;
} }
if (draw==true) { if (draw==true) {
if (style.a) { if (style.a) {
link.add(stroka_x,stroka_y,get_label_len(text.start),list.item_h,text.start," "); link.add(stroka_x,stroka_y + size_pt_change,get_label_len(text.start),list.item_h,text.start," ");
label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color);
} }
WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start);
@ -132,7 +132,7 @@ _tag tag;
} }
if (draw==true) { if (draw==true) {
if (style.a) { if (style.a) {
link.add(stroka_x,stroka_y,get_label_len(text.start),list.item_h,text.start," "); link.add(stroka_x,stroka_y + size_pt_change,get_label_len(text.start),list.item_h,text.start," ");
label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color);
} }
WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start);
@ -169,10 +169,12 @@ _tag tag;
size_pt_change = -4; size_pt_change = -4;
} }
label.size.pt += size_pt_change; label.size.pt += size_pt_change;
get_label_symbols_size();
if (size_pt_change > 0) { if (size_pt_change > 0) {
stroka_y+= list.item_h; stroka_y+= list.item_h;//что если будет очень длинная строка в теге?
} else { } else {//коммент выше и коммент ниже связаны
stroka_y+= list.item_h - size_pt_change; stroka_y+= list.item_h - size_pt_change;//не очень понятна логика этого места
size_pt_change = 0;
} }
stroka_x = HTML_PADDING_X; stroka_x = HTML_PADDING_X;
continue; continue;