Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

WebView: bugfix

Browse Source 
git-svn-id: svn://kolibrios.org@9104 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-08-02 17:57:41 +00:00
parent 778de94be4
commit 5c1c425d92
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
programs/cmm/browser/TWB/set_style.h
View File

@ -346,7 +346,6 @@ void TWebBrowser::tag_table()
if (tdepth==0) { if (tdepth==0) {
draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN;
draw_w = list.w; draw_w = list.w;
draw_y = math.max(draw_y+style.cur_line_h, tallest_cell_in_row); draw_y = math.max(draw_y+style.cur_line_h, tallest_cell_in_row);
row_start_y = draw_y = tallest_cell_in_row = draw_y; row_start_y = draw_y = tallest_cell_in_row = draw_y;
style.cur_line_h = list.item_h; style.cur_line_h = list.item_h;
@ -360,14 +359,14 @@ void TWebBrowser::tag_table()
if (!secondrun) { if (!secondrun) {
if (tag.is("tr")) { if (tag.is("tr")) {
if (colcount) tr_col_count.set(tr_col_count.count-1, colcount);
colcount = 0;
if (tag.opened) { if (tag.opened) {
tr_col_count.add(1); tr_col_count.add(1);
} }
colcount = 0;
} }
if (tag.opened) && (tag.is("td")) || (tag.is("th")) { if (tag.opened) && (tag.is("td")) || (tag.is("th")) {
colcount++; colcount++;
if (colcount) tr_col_count.set(tr_col_count.count-1, colcount);
//if (tag.get_number_of("colspan")) colcount += tag.number-1; //if (tag.get_number_of("colspan")) colcount += tag.number-1;
} }
} else { } else {
@ -382,10 +381,10 @@ void TWebBrowser::tag_table()
tr_pos++; tr_pos++;
td_pos = 0; td_pos = 0;
} else { } else {
draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; draw_y = math.max(draw_y, tallest_cell_in_row);
draw_w = list.w;
draw_y = tallest_cell_in_row;
} }
draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN;
draw_w = list.w;
} }
if (tr_pos) && (tag.is("td")) || (tag.is("th")) { if (tr_pos) && (tag.is("td")) || (tag.is("th")) {
tallest_cell_in_row = math.max(draw_y+style.cur_line_h-list.item_h, tallest_cell_in_row); tallest_cell_in_row = math.max(draw_y+style.cur_line_h-list.item_h, tallest_cell_in_row);

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

@ -107,4 +107,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw";
#define DEFAULT_URL URL_SERVICE_HOMEPAGE #define DEFAULT_URL URL_SERVICE_HOMEPAGE
char version[]="WebView 3.5"; char version[]="WebView 3.51";