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

WebView 3.61: fixes release

Browse Source 
git-svn-id: svn://kolibrios.org@9296 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-11-21 18:22:14 +00:00
parent 413de97517
commit 58e8cfd0d6
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
programs/cmm/browser/TWB/links.h
View File

@ -3,8 +3,8 @@ dword CursorFile = FROM "TWB/pointer.cur";
#include "..\lib\collection.h" #include "..\lib\collection.h"
struct PAGE_LINKS { struct PAGE_LINKS {
collection link; collection unic_links;
collection page_links; collection element_links;
collection_int x; collection_int x;
collection_int y; collection_int y;
@ -24,7 +24,7 @@ struct PAGE_LINKS {
void PAGE_LINKS::add_link(dword lpath) 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) 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); w.add(_w);
h.add(_h); h.add(_h);
underline_h.add(_underline_h); underline_h.add(_underline_h);
link.add(page_links.get_last()); element_links.add(unic_links.get_last());
id.add(page_links.count); id.add(unic_links.count);
} }
void PAGE_LINKS::clear() void PAGE_LINKS::clear()
@ -45,11 +45,10 @@ void PAGE_LINKS::clear()
w.drop(); w.drop();
h.drop(); h.drop();
underline_h.drop(); underline_h.drop();
link.drop(); element_links.drop();
unic_links.drop();
id.drop(); id.drop();
page_links.drop();
page_links.realloc_size = 4096 * 32;
active = -1; active = -1;
active_url = 0; active_url = 0;
CursorPointer.Restore(); 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(active, list_first, list_y, link_color_default);
draw_underline(i, list_first, list_y, DEFAULT_BG_COL); draw_underline(i, list_first, list_y, DEFAULT_BG_COL);
active_url = link.get(i); active_url = element_links.get(i);
active = i; active = i;
DrawStatusBar(active_url); DrawStatusBar(active_url);
} }

2
programs/cmm/browser/TWB/render.h
View File

@ -111,9 +111,7 @@ void TWebBrowser::RenderTextbuf()
RenderLine(lbp); RenderLine(lbp);
} }
} }
debugln("rnd_");
RenderLine(lbp); RenderLine(lbp);
debugln("_rnd");
} }
void TWebBrowser::NewLine() void TWebBrowser::NewLine()

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

@ -12,7 +12,7 @@
// // // //
//===================================================// //===================================================//
#define MEMSIZE 1024 * 130 #define MEMSIZE 1024 * 160
#include "..\lib\gui.h" #include "..\lib\gui.h"
#include "..\lib\draw_buf.h" #include "..\lib\draw_buf.h"
#include "..\lib\list_box.h" #include "..\lib\list_box.h"

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.6"; char version[]="WebView 3.61";

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

@ -25,11 +25,13 @@
<a href=//th99.infania.net>Total Hardware 1999</a> <a href=//th99.infania.net>Total Hardware 1999</a>
<a href=//toastytech.com/guis/index.html>GUI Gallery</a> <a href=//toastytech.com/guis/index.html>GUI Gallery</a>
<a href=//menuetos.net>menuetos.net</a> <a href=//menuetos.net>menuetos.net</a>
<tr><td>Moderate: <tr><td>
Moderate:
<a href=//fdd5-25.pdp-11.ru>fdd5-25</a> <a href=//fdd5-25.pdp-11.ru>fdd5-25</a>
<a href=//acmp.ru/index.asp?main=tasks>acmp.ru</a> <a href=//acmp.ru/index.asp?main=tasks>acmp.ru</a>
<a href=//old-dos.ru>old-dos.ru</a> <a href=//old-dos.ru>old-dos.ru</a>
<a href=//www.weitek.com/textual/support/driver.html>weitek</a> <a href=//www.weitek.com/textual/support/driver.html>weitek</a>
<a href=//www.abandonwarering.com/?Page=Listing>abandonware</a>
<td>Complex: <td>Complex:
<a href=//artcon.ru>artcon.ru</a> <a href=//artcon.ru>artcon.ru</a>
<a href=//nubo.ru>nubo.ru</a> <a href=//nubo.ru>nubo.ru</a>