Rev 6370 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 6370 | Rev 6372 | ||
---|---|---|---|
Line 75... | Line 75... | ||
75 | { |
75 | { |
76 | dword DOM_start, DOM_end, DOM_len, DOM_pos; |
76 | dword DOM_start, DOM_end, DOM_len, DOM_pos; |
77 | int stroka_x = HTML_PADDING_X; |
77 | int stroka_x = HTML_PADDING_X; |
78 | int stroka_y = HTML_PADDING_Y; |
78 | int stroka_y = HTML_PADDING_Y; |
79 | int size_pt_change; |
79 | int size_pt_change = 0; |
80 | dword line_break; |
80 | dword line_break; |
81 | byte ch, zeroch; |
81 | byte ch, zeroch; |
82 | _text text; |
82 | _text text; |
83 | _tag tag; |
83 | _tag tag; |
84 | 84 | ||
Line 117... | Line 117... | ||
117 | ESBYTE[line_break] >< zeroch; //restore line |
117 | ESBYTE[line_break] >< zeroch; //restore line |
118 | } |
118 | } |
119 | if (draw==true) { |
119 | if (draw==true) { |
120 | if (style.a) { |
120 | if (style.a) { |
121 | link.add(stroka_x,stroka_y,get_label_len(text.start),list.item_h,text.start," "); |
121 | link.add(stroka_x,stroka_y + size_pt_change,get_label_len(text.start),list.item_h,text.start," "); |
122 | label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); |
122 | label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); |
123 | } |
123 | } |
124 | WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); |
124 | WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); |
125 | } |
125 | } |
126 | stroka_x+=char_width[' ']; |
126 | stroka_x+=char_width[' ']; |
127 | ESBYTE[line_break] >< zeroch; //restore line |
127 | ESBYTE[line_break] >< zeroch; //restore line |
Line 130... | Line 130... | ||
130 | stroka_y += list.item_h; |
130 | stroka_y += list.item_h; |
131 | } |
131 | } |
132 | if (draw==true) { |
132 | if (draw==true) { |
133 | if (style.a) { |
133 | if (style.a) { |
134 | link.add(stroka_x,stroka_y,get_label_len(text.start),list.item_h,text.start," "); |
134 | link.add(stroka_x,stroka_y + size_pt_change,get_label_len(text.start),list.item_h,text.start," "); |
135 | label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); |
135 | label_draw_bar(stroka_x, stroka_y+label.size.pt+1, get_label_len(text.start), style.color); |
136 | } |
136 | } |
137 | WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); |
137 | WriteTextIntoBuf(stroka_x, stroka_y, style.color, text.start); |
138 | } |
138 | } |
139 | stroka_x+=char_width[' ']; |
139 | stroka_x+=char_width[' ']; |
140 | stroka_x += get_label_len(text.start); |
140 | stroka_x += get_label_len(text.start); |
Line 167... | Line 167... | ||
167 | } else if (tag.nameis("/h3")) { |
167 | } else if (tag.nameis("/h3")) { |
168 | size_pt_change = -4; |
168 | size_pt_change = -4; |
169 | } |
169 | } |
170 | label.size.pt += size_pt_change; |
170 | label.size.pt += size_pt_change; |
171 | if (size_pt_change > 0) { |
171 | get_label_symbols_size(); |
- | 172 | if (size_pt_change > 0) { |
|
172 | stroka_y+= list.item_h; |
173 | stroka_y+= list.item_h;//что если будет очень длинная строка в теге? |
173 | } else { |
174 | } else {//коммент выше и коммент ниже связаны |
174 | stroka_y+= list.item_h - size_pt_change; |
175 | stroka_y+= list.item_h - size_pt_change;//не очень понятна логика этого места |
- | 176 | size_pt_change = 0; |
|
175 | } |
177 | } |
176 | stroka_x = HTML_PADDING_X; |
178 | stroka_x = HTML_PADDING_X; |
177 | continue; |
179 | continue; |
178 | } |
180 | } |
179 | if (tag.nameis("script")) || (tag.nameis("style")) style.ignore = true; |
181 | if (tag.nameis("script")) || (tag.nameis("style")) style.ignore = true; |
180 | if (tag.nameis("/script")) || (tag.nameis("/style")) style.ignore = false; |
182 | if (tag.nameis("/script")) || (tag.nameis("/style")) style.ignore = false; |