From 5c1c425d92b88ffd1aa01e88248cdc4a372f4958 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 2 Aug 2021 17:57:41 +0000 Subject: [PATCH] WebView: bugfix git-svn-id: svn://kolibrios.org@9104 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/TWB/set_style.h | 11 +++++------ programs/cmm/browser/const.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/cmm/browser/TWB/set_style.h b/programs/cmm/browser/TWB/set_style.h index e85b06e820..4026bdff7d 100644 --- a/programs/cmm/browser/TWB/set_style.h +++ b/programs/cmm/browser/TWB/set_style.h @@ -346,7 +346,6 @@ void TWebBrowser::tag_table() if (tdepth==0) { draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; draw_w = list.w; - 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; style.cur_line_h = list.item_h; @@ -360,14 +359,14 @@ void TWebBrowser::tag_table() if (!secondrun) { if (tag.is("tr")) { - if (colcount) tr_col_count.set(tr_col_count.count-1, colcount); - colcount = 0; if (tag.opened) { tr_col_count.add(1); } + colcount = 0; } if (tag.opened) && (tag.is("td")) || (tag.is("th")) { colcount++; + if (colcount) tr_col_count.set(tr_col_count.count-1, colcount); //if (tag.get_number_of("colspan")) colcount += tag.number-1; } } else { @@ -382,10 +381,10 @@ void TWebBrowser::tag_table() tr_pos++; td_pos = 0; } else { - draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; - draw_w = list.w; - draw_y = tallest_cell_in_row; + draw_y = math.max(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")) { tallest_cell_in_row = math.max(draw_y+style.cur_line_h-list.item_h, tallest_cell_in_row); diff --git a/programs/cmm/browser/const.h b/programs/cmm/browser/const.h index c7b3d4fdfc..636e0eb39a 100644 --- a/programs/cmm/browser/const.h +++ b/programs/cmm/browser/const.h @@ -107,4 +107,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw"; #define DEFAULT_URL URL_SERVICE_HOMEPAGE -char version[]="WebView 3.5"; \ No newline at end of file +char version[]="WebView 3.51"; \ No newline at end of file