From 58e8cfd0d6dac6db163cdcf8d522b52bd47a3878 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 21 Nov 2021 18:22:14 +0000 Subject: [PATCH] WebView 3.61: fixes release git-svn-id: svn://kolibrios.org@9296 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/TWB/links.h | 17 ++++++++--------- programs/cmm/browser/TWB/render.h | 2 -- programs/cmm/browser/WebView.c | 2 +- programs/cmm/browser/const.h | 2 +- programs/cmm/browser/res/test.htm | 4 +++- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/cmm/browser/TWB/links.h b/programs/cmm/browser/TWB/links.h index 8e456d75bf..ab653eb299 100644 --- a/programs/cmm/browser/TWB/links.h +++ b/programs/cmm/browser/TWB/links.h @@ -3,8 +3,8 @@ dword CursorFile = FROM "TWB/pointer.cur"; #include "..\lib\collection.h" struct PAGE_LINKS { - collection link; - collection page_links; + collection unic_links; + collection element_links; collection_int x; collection_int y; @@ -24,7 +24,7 @@ struct PAGE_LINKS { void PAGE_LINKS::add_link(dword lpath) { - page_links.add(lpath); + unic_links.add(lpath); } void PAGE_LINKS::add_text(dword _x, _y, _w, _h, _underline_h) @@ -34,8 +34,8 @@ void PAGE_LINKS::add_text(dword _x, _y, _w, _h, _underline_h) w.add(_w); h.add(_h); underline_h.add(_underline_h); - link.add(page_links.get_last()); - id.add(page_links.count); + element_links.add(unic_links.get_last()); + id.add(unic_links.count); } void PAGE_LINKS::clear() @@ -45,11 +45,10 @@ void PAGE_LINKS::clear() w.drop(); h.drop(); underline_h.drop(); - link.drop(); + element_links.drop(); + unic_links.drop(); id.drop(); - page_links.drop(); - page_links.realloc_size = 4096 * 32; active = -1; active_url = 0; CursorPointer.Restore(); @@ -90,7 +89,7 @@ bool PAGE_LINKS::hover(dword list_y, list_first) draw_underline(active, list_first, list_y, link_color_default); draw_underline(i, list_first, list_y, DEFAULT_BG_COL); - active_url = link.get(i); + active_url = element_links.get(i); active = i; DrawStatusBar(active_url); } diff --git a/programs/cmm/browser/TWB/render.h b/programs/cmm/browser/TWB/render.h index dc36a563c1..b1d2002b4d 100644 --- a/programs/cmm/browser/TWB/render.h +++ b/programs/cmm/browser/TWB/render.h @@ -111,9 +111,7 @@ void TWebBrowser::RenderTextbuf() RenderLine(lbp); } } - debugln("rnd_"); RenderLine(lbp); - debugln("_rnd"); } void TWebBrowser::NewLine() diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 321df6e79b..056d0433a2 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -12,7 +12,7 @@ // // //===================================================// -#define MEMSIZE 1024 * 130 +#define MEMSIZE 1024 * 160 #include "..\lib\gui.h" #include "..\lib\draw_buf.h" #include "..\lib\list_box.h" diff --git a/programs/cmm/browser/const.h b/programs/cmm/browser/const.h index 01d4b31eb6..f0d294d2f2 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.6"; \ No newline at end of file +char version[]="WebView 3.61"; \ No newline at end of file diff --git a/programs/cmm/browser/res/test.htm b/programs/cmm/browser/res/test.htm index b72ca41d13..6e70a3d81c 100644 --- a/programs/cmm/browser/res/test.htm +++ b/programs/cmm/browser/res/test.htm @@ -25,11 +25,13 @@ Total Hardware 1999 GUI Gallery menuetos.net -Moderate: + +Moderate: fdd5-25 acmp.ru old-dos.ru weitek +abandonware Complex: artcon.ru nubo.ru