Rev 4666 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4666 | Rev 4674 | ||
---|---|---|---|
Line 631... | Line 631... | ||
631 | DrawBuf.DrawBar(5, list.line_h/2, list.w-10, 1, hr_color); |
631 | DrawBuf.DrawBar(5, list.line_h/2, list.w-10, 1, hr_color); |
632 | NewLine(left1, top1+list.line_h); |
632 | NewLine(left1, top1+list.line_h); |
633 | } |
633 | } |
634 | if (isTag("img")) |
634 | if (isTag("img")) |
635 | { |
635 | { |
636 | ImgCache.Images( left1, top1); |
636 | ImgCache.Images( left1, top1, WB1.list.w); |
637 | return; |
637 | return; |
638 | } |
638 | } |
639 | if (isTag("meta")) || (isTag("?xml")) |
639 | if (isTag("meta")) || (isTag("?xml")) |
640 | { |
640 | { |
641 | do{ |
641 | do{ |
Line 654... | Line 654... | ||
654 | } while(GetNextParam()); |
654 | } while(GetNextParam()); |
655 | return; |
655 | return; |
656 | } |
656 | } |
657 | } |
657 | } |
Line 658... | Line 658... | ||
658 | 658 | ||
659 | void TWebBrowser::DrawScroller() //íå îïòèìàëüíàÿ îòðèñîâêà, íî çàòî â îäíîì ìåñòå |
659 | void TWebBrowser::DrawScroller() |
660 | { |
660 | { |
661 | scroll_wv.max_area = list.count; |
661 | scroll_wv.max_area = list.count; |
662 | scroll_wv.cur_area = list.visible; |
662 | scroll_wv.cur_area = list.visible; |
Line 671... | Line 671... | ||
671 | } |
671 | } |
Line 672... | Line 672... | ||
672 | 672 | ||
673 | 673 | ||
674 | void TWebBrowser::NewLine(int left1, top1) |
674 | void TWebBrowser::NewLine(int left1, top1) |
675 | { |
675 | { |
676 | if (!stroka) DrawBar(list.x, list.y, list.w, 5, bg_color); //çàêðàøèâàåì ôîí íàä ïåðâîé ñòðîêîé |
676 | if (!stroka) DrawBar(list.x, list.y, list.w, 5, bg_color); |
677 | if (t_html) && (!t_body) return; |
677 | if (t_html) && (!t_body) return; |
678 | if (top1>=list.y) && ( top1 < list.h+list.y-10) && (!anchor) |
678 | if (top1>=list.y) && ( top1 < list.h+list.y-10) && (!anchor) |
679 | { |
679 | { |
- | 680 | if (text_align == ALIGN_CENTER) DrawBuf.AlignCenter(left1,top1,list.w,list.line_h,stolbec * 6); |
|
680 | if (text_align == ALIGN_CENTER) DrawBuf.AlignCenter(left1,top1,list.w,list.line_h,stolbec * 6); |
681 | if (text_align == ALIGN_RIGHT) DrawBuf.AlignRight(left1,top1,list.w,list.line_h,stolbec * 6); |
681 | if (text_align == ALIGN_RIGHT) DrawBuf.AlignRight(left1,top1,list.w,list.line_h,stolbec * 6); |
682 | DrawBuf.bufy = top1; |
682 | DrawBuf.Show(); |
683 | DrawBuf.Show(); |
683 | DrawBuf.Fill(bg_color); |
684 | DrawBuf.Fill(bg_color); |
684 | } |
685 | } |