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

WebView fix for tables: line postion and autoclose some tags

Browse Source 
git-svn-id: svn://kolibrios.org@9293 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-11-21 03:19:08 +00:00
parent 3a581bafa7
commit 40ec5cc46e
9 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,7 @@ void TWebBrowser::tag_hr()
dword hrcol = 0x00777777;
if (tag.get_value_of("color")) hrcol = GetColor(tag.value);
if (draw_x != left_gap) NewLine();
if (secondrun) canvas.DrawBar(5, style.cur_line_h / 2 + draw_y - 1, draw_w-10, 1, hrcol);
if (secondrun) canvas.DrawBar(5+left_gap, style.cur_line_h / 2 + draw_y - 1, draw_w-10, 1, hrcol);
draw_x++;
NewLine();
return;
@ -342,6 +342,12 @@ void TWebBrowser::tag_table_reset()
void TWebBrowser::tag_table()
{
if (!tag.opened) {
if (style.font) tag_font();
if (link) tag_a();
style.b = false;
}
if (tag.is("table")) {
if(tag.opened) {
table.depth++;

2
programs/cmm/browser/WebView.c
View File

@ -44,6 +44,7 @@
//===================================================//
bool debug_mode = false;
bool show_images = true;
bool source_mode = false;
_history history;
@ -63,7 +64,6 @@ dword TOOLBAR_H = PADDING+TSZE+PADDING+2;
_http http = 0;
bool source_mode = false;
progress_bar prbar;
proc_info Form;

7
programs/cmm/browser/build.bat
View File

@ -1,6 +1,11 @@
@ECHO OFF
call "compile_ru.bat"
@c-- /D=LANG_RUS WebView.c
@del WebView
@rename WebView.com WebView
@del warning.txt
if not exist WebView ( @pause )
if exist WebView (
"C:\Program Files (x86)\WinImage\winimage.exe" "C:\Users\leency\Desktop\kolibri.img" /H /Q /I WebView

0
programs/cmm/browser/compile_en.sh → programs/cmm/browser/build.sh
View File

6
programs/cmm/browser/compile_en.bat
View File

@ -1,6 +0,0 @@
@c-- /D=LANG_ENG WebView.c
@del WebView
@rename WebView.com WebView
@del warning.txt
if not exist WebView ( @pause )

6
programs/cmm/browser/compile_ru.bat
View File

@ -1,6 +0,0 @@
@c-- /D=LANG_RUS WebView.c
@del WebView
@rename WebView.com WebView
@del warning.txt
if not exist WebView ( @pause )

1
programs/cmm/browser/compile_ru.sh
View File

@ -1 +0,0 @@
../c--/c--.elf -D=LANG_RUS WebView.c

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
char version[]="WebView 3.52b";
char version[]="WebView 3.52c";

8
programs/cmm/browser/res/test.htm
View File

@ -7,6 +7,9 @@
<a href=//store.kolibri-n.org>Kolibri Store</a>
<table><tr><td>Simplest:
<a href=//nostalgy.net.ru/>nostalgy.net.ru</a>
<a href=//pci-ids.ucw.cz>pci.ids</a>
<a href=//dgmag.in>dgmag.in</a>
<a href=//bash.im>bash.im</a>
<a href=//opennet.ru>opennet</a>
<a href=//linux.org.ru>LOR</a>
@ -14,8 +17,7 @@
<a href=//samlib.ru/b>samlib.ru/b</a>
<a href=//mirrors.pdp-11.ru>mirrors.pdp-11.ru</a>
<td>Simple:
<a href=//pci-ids.ucw.cz/>pci.ids</a>
<a href=//dgmag.in>dgmag.in</a>
<a href=//lionovsky.us>lionovsky.us</a>
<a href=//os-menuet.narod.ru>os-menuet.narod.ru</a>
<a href=//mestack.narod.ru/index.html>mestack.narod.ru</a>
<a href=//coolthemes.narod.ru/indexold.html>coolthemes.narod.ru</a>
@ -23,13 +25,11 @@
<a href=//th99.infania.net>Total Hardware 1999</a>
<a href=//toastytech.com/guis/index.html>GUI Gallery</a>
<a href=//menuetos.net>menuetos.net</a>
<tr><td>Moderate:
<a href=//fdd5-25.pdp-11.ru>fdd5-25</a>
<a href=//acmp.ru/index.asp?main=tasks>acmp.ru</a>
<a href=//old-dos.ru>old-dos.ru</a>
<a href=//www.weitek.com/textual/support/driver.html>weitek</a>
<td>Complex:
<a href=//artcon.ru>artcon.ru</a>
<a href=//nubo.ru>nubo.ru</a>