Subversion Repositories Kolibri OS

Rev

Rev 6058 | Rev 6366 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6058 Rev 6278
Line 235... Line 235...
235
							http_free stdcall (http_transfer);
235
							http_free stdcall (http_transfer);
236
							http_transfer=0;
236
							http_transfer=0;
237
							GetAbsoluteURL(#URL);
237
							GetAbsoluteURL(#URL);
238
							history.back();
238
							history.back();
239
							strcpy(#editURL, #URL);
239
							strcpy(#editURL, #URL);
240
							DrawEditBox();
240
							DrawEditBoxWebView();
241
							OpenPage();
241
							OpenPage();
242
						}
242
						}
243
						else
243
						else
244
						{
244
						{
245
							history.add(#URL);
245
							history.add(#URL);
Line 288... Line 288...
288
	DefineButton(address_box.left+address_box.width+1, address_box.top-3, 16, skin.h-1, REFRESH_BUTTON+BT_HIDE+BT_NOFRAME, 0);
288
	DefineButton(address_box.left+address_box.width+1, address_box.top-3, 16, skin.h-1, REFRESH_BUTTON+BT_HIDE+BT_NOFRAME, 0);
289
	DefineButton(Form.cwidth-24, address_box.top-3, 19, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0);
289
	DefineButton(Form.cwidth-24, address_box.top-3, 19, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0);
290
	img_draw stdcall(skin.image, Form.cwidth-22, address_box.top-3, 16, skin.h, 85, 0);
290
	img_draw stdcall(skin.image, Form.cwidth-22, address_box.top-3, 16, skin.h, 85, 0);
291
	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg);
291
	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg);
292
	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
292
	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
293
	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBox(); }
293
	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBoxWebView(); }
294
	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col);
294
	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col);
295
	DrawProgress();
295
	DrawProgress();
Line 296... Line 296...
296
 
296
 
297
	/*
297
	/*
Line 424... Line 424...
424
	if (!strncmp(#URL,"WebView:",8))
424
	if (!strncmp(#URL,"WebView:",8))
425
	{
425
	{
426
		SetPageDefaults();
426
		SetPageDefaults();
427
		if (!strcmp(#URL, URL_SERVICE_HOME)) WB1.LoadInternalPage(#homepage, sizeof(homepage));
427
		if (!strcmp(#URL, URL_SERVICE_HOME)) WB1.LoadInternalPage(#homepage, sizeof(homepage));
428
		else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory();
428
		else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory();
429
		DrawEditBox();
429
		DrawEditBoxWebView();
430
		return;
430
		return;
431
	}
431
	}
432
	if (!strncmp(#URL,"http:",5))
432
	if (!strncmp(#URL,"http:",5))
433
	{
433
	{
434
		img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, 131, 0);
434
		img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, 131, 0);
Line 456... Line 456...
456
		}
456
		}
457
		ShowPage();
457
		ShowPage();
458
	}
458
	}
459
}
459
}
Line 460... Line 460...
460
 
460
 
461
DrawEditBox()
461
DrawEditBoxWebView()
462
{
462
{
463
	DrawWideRectangle(address_box.left-2, address_box.top-2, address_box.width+3, 19, 2, address_box.color);
463
	DrawWideRectangle(address_box.left-2, address_box.top-2, address_box.width+3, 19, 2, address_box.color);
464
	address_box.size = address_box.pos = address_box.shift = address_box.shift_old = strlen(#editURL);
464
	address_box.size = address_box.pos = address_box.shift = address_box.shift_old = strlen(#editURL);
465
	address_box.offset = 0;
465
	address_box.offset = 0;
Line 469... Line 469...
469
}
469
}
Line 470... Line 470...
470
 
470
 
471
 
471
 
472
void ShowPage()
472
void ShowPage()
473
{
473
{
474
	DrawEditBox();
474
	DrawEditBoxWebView();
475
	if (!bufsize)
475
	if (!bufsize)
476
	{
476
	{
477
		if (http_transfer) WB1.LoadInternalPage(#loading, sizeof(loading));
477
		if (http_transfer) WB1.LoadInternalPage(#loading, sizeof(loading));