diff --git a/programs/cmm/TWB/TWB.c b/programs/cmm/TWB/TWB.c index 160cf224f9..455d60533a 100644 --- a/programs/cmm/TWB/TWB.c +++ b/programs/cmm/TWB/TWB.c @@ -1,5 +1,6 @@ #include "..\lib\draw_buf.h" #include "..\lib\list_box.h" +#include "..\lib\cursor.h" #include "..\TWB\links.h" int downloader_id; @@ -595,7 +596,7 @@ void TWebBrowser::WhatTextStyle(int left1, top1, width1) { } ELSE li_tab++; if (isTag("dd")) stolbec += 5; if (isTag("blockquote")) blq_text = opened; - if (isTag("pre")) pre_text = opened; + if (isTag("pre")) || (isTag("code")) pre_text = opened; if (isTag("hr")) { if (anchor) || (stroka < -1) diff --git a/programs/cmm/TWB/links.h b/programs/cmm/TWB/links.h index c99cec22a1..16cebaa965 100644 --- a/programs/cmm/TWB/links.h +++ b/programs/cmm/TWB/links.h @@ -1,3 +1,6 @@ +CustomCursor CursorPointer; +dword CursorFile = FROM "../TWB/pointer.cur"; + struct array_link { dword link, text; int x,y,w,h; @@ -51,81 +54,32 @@ void LinksArray::Clear() buflen = #page_links; count = 0; active = -1; + CursorPointer.Restore(); } + void LinksArray::Hover(dword mx, my, link_col_in, link_col_a, bg_col) { int i; - if (active>=0) - { - //WriteText(links[active].x,links[active].y, 0x80, link_col_in, links[active].text); - DrawBar(links[active].x,links[active].y+8,links[active].w,1, link_col_in); - active = -1; - } for (i=0; ilinks[i].x) && (my>links[i].y) && (mx