Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7770 → Rev 7769

/programs/cmm/browser/WebView.c
72,7 → 72,6
NEW_WINDOW,
VIEW_HISTORY,
DOWNLOAD_MANAGER,
CLEAR_CACHE,
UPDATE_BROWSER,
COPY_LINK_URL,
DOWNLOAD_LINK_CONTENTS,
141,7 → 140,7
mouse.get();
if (PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y, WB1.list.y, WB1.list.first))
&& (mouse.pkm) && (mouse.up) {
if (WB1.list.MouseOver(mouse.x, mouse.y)) EventShowPageMenu();
if (WB1.list.MouseOver(mouse.x, mouse.y)) EventShowPageMenu(mouse.x, mouse.y);
break;
}
if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
203,6 → 202,10
break;
 
case evReDraw:
if (menu.cur_y) {
ProcessEvent(menu.cur_y);
menu.cur_y = 0;
}
DefineAndDrawWindow(GetScreenWidth()-800/2-random(80),
GetScreenHeight()-700/2-random(80),800,700,0x73,0,0,0);
GetProcessInfo(#Form, SelfInfo);
256,11 → 259,6
void draw_window()
{
int i;
if (menu.cur_y) {
EAX = menu.cur_y;
menu.cur_y = 0;
ProcessEvent(EAX);
}
SetElementSizes();
 
DrawBar(0,0, Form.cwidth,PADDING, system.color.work);
343,10 → 341,10
}
return;
case CHANGE_ENCODING:
EventShowEncodingsList();
EventShowEncodingsList(Form.cwidth - 150, status_text.start_y-117);
return;
case SANDWICH_BUTTON:
EventShowMainMenu();
EventShowMainMenu(Form.cwidth - 215, TOOLBAR_H-6);
return;
case VIEW_SOURCE:
EventViewSource();
371,10 → 369,6
case UPDATE_BROWSER:
EventUpdateBrowser();
return;
case CLEAR_CACHE:
pages_cache.clear();
notify(#clear_cache_ok);
return;
case COPY_LINK_URL:
Clipboard__CopyText(PageLinks.GetURL(PageLinks.active));
notify("'URL copied to clipboard'O");
634,29 → 628,29
DrawBar(address_box.left-1, address_box.top+20, persent*address_box.width+16/100, 2, 0x72B7EB);
}
 
void EventShowPageMenu()
void EventShowPageMenu(dword _left, _top)
{
menu.selected = 0;
menu.show(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, 220, #rmb_menu, VIEW_SOURCE);
menu.show(Form.left+_left-6,Form.top+_top+skin_height+3, 220, #rmb_menu, VIEW_SOURCE);
}
 
void EventShowLinkMenu()
void EventShowEncodingsList(dword _left, _top)
{
menu.selected = 0;
menu.show(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, 220, #link_menu, COPY_LINK_URL);
menu.selected = WB1.cur_encoding + 1;
menu.show(Form.left+_left-6+77,Form.top+_top+skin_height-3, 100,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866", ENCODINGS);
}
 
void EventShowEncodingsList()
void EventShowMainMenu(dword _left, _top)
{
menu.selected = WB1.cur_encoding + 1;
menu.show(Form.left + Form.cwidth - 95, Form.top + skin_height + status_text.start_y - 121, 90,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866", ENCODINGS);
menu.selected = 0;
menu.show(Form.left+_left-6+77,Form.top+_top+skin_height-3, 140, #main_menu, OPEN_FILE);
}
 
void EventShowMainMenu()
void EventShowLinkMenu(dword _left, _top)
{
menu.selected = 0;
menu.show(Form.left + Form.cwidth - 150, Form.top + skin_height + TOOLBAR_H-8, 140, #main_menu, OPEN_FILE);
menu.show(Form.left+_left-6,Form.top+_top+skin_height+3, 220, #link_menu, COPY_LINK_URL);
}
 
void EventUpdateProgressBar()