From 672c7ac0a1da00855267e9db5193066028814121 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 20 Nov 2016 19:34:39 +0000
Subject: [PATCH] WebView 1.53: fixed wrong position of link selection while
 click, bigger toolbar elements, show alert that HTTPS protocol is not
 supported yet

git-svn-id: svn://kolibrios.org@6731 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/TWB/links.h         |   2 +-
 programs/cmm/browser/WebView.c   |  37 ++++++++++++++++---------------
 programs/cmm/browser/wv_skin.png | Bin 2058 -> 2168 bytes
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/programs/cmm/TWB/links.h b/programs/cmm/TWB/links.h
index 8871adc72a..dbbf6ccff3 100644
--- a/programs/cmm/TWB/links.h
+++ b/programs/cmm/TWB/links.h
@@ -71,7 +71,7 @@ void LinksArray::Hover(dword mx, my, link_col_in, link_col_a, bg_col)
 	{
 		if (mx>links[i].x) && (my>links[i].y) && (mx<links[i].x+links[i].w) && (my<links[i].y+links[i].h)
 		{
-			if (mouse.down) DrawRectangle(links[active].x, links[active].y, links[active].w, links[active].h, 0);
+			if (mouse.down) DrawRectangle(links[active].x, -WB1.list.first*WB1.list.item_h + links[active].y, links[active].w, links[active].h, 0);
 			if (mouse.up) ClickLink();
 			if (active==i) return;
 			CursorPointer.Set();
diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c
index 718c2a27fe..70d46b1ad7 100644
--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -30,7 +30,7 @@
 char homepage[] = FROM "html\\homepage.htm""\0";
 
 #ifdef LANG_RUS
-char version[]="Текстовый браузер 1.52";
+char version[]="Текстовый браузер 1.53";
 ?define IMAGES_CACHE_CLEARED "Кэш картинок очищен"
 ?define T_LAST_SLIDE "Это последний слайд"
 char loading[] = "Загрузка страницы...<br>";
@@ -43,7 +43,7 @@ char rmb_menu[] =
 Очистить кэш картинок
 Менеджер загрузок";
 #else
-char version[]="Text-based Browser 1.52";
+char version[]="Text-based Browser 1.53";
 ?define IMAGES_CACHE_CLEARED "Images cache cleared"
 ?define T_LAST_SLIDE "This slide is the last"
 char loading[] = "Loading...<br>";
@@ -73,7 +73,7 @@ int action_buf;
 dword http_transfer = 0;
 dword http_buffer;
 
-dword TOOLBAR_H = 33;
+dword TOOLBAR_H = 40;
 dword STATUSBAR_H = 15;
 dword col_bg;
 dword panel_color;
@@ -105,7 +105,7 @@ enum {
 
 char editURL[sizeof(URL)];
 int	mouse_twb;
-edit_box address_box = {250,56,34,0xffffff,0x94AECE,0xffffff,0xffffff,0,sizeof(URL),#editURL,#mouse_twb,2,19,19};
+edit_box address_box = {250,60,30,0xffffff,0x94AECE,0xffffff,0xffffff,0x10000000,sizeof(URL),#editURL,#mouse_twb,2,19,19};
 
 
 void main()
@@ -260,8 +260,8 @@ void main()
 
 void SetElementSizes()
 {
-	address_box.top = TOOLBAR_H/2-7;
-	address_box.width = Form.cwidth - address_box.left - 25 - 22;
+	address_box.top = TOOLBAR_H/2-10;
+	address_box.width = Form.cwidth - address_box.left - 50;
 	WB1.list.SetSizes(0, TOOLBAR_H, Form.width - 10 - scroll_wv.size_x / WB1.DrawBuf.zoom, 
 		Form.cheight - TOOLBAR_H - STATUSBAR_H, WB1.list.font_h + WB1.DrawBuf.zoom + WB1.DrawBuf.zoom * WB1.DrawBuf.zoom);
 	WB1.list.wheel_size = 7;
@@ -281,13 +281,13 @@ void Draw_Window()
 	DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, 0xD7D0D3);
 	DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, border_color);
 	SetElementSizes();
-	DrawRectangle(address_box.left-3, address_box.top-3, address_box.width+5, 20,border_color);
-	DefineButton(address_box.left-50, address_box.top-2, 23, skin.h-2, BACK_BUTTON+BT_HIDE, 0);
-	DefineButton(address_box.left-26, address_box.top-2, 23, skin.h-2, FORWARD_BUTTON+BT_HIDE, 0);
-	img_draw stdcall(skin.image, address_box.left-51, address_box.top-3, 48, skin.h, 3, 0);
+	DrawRectangle(address_box.left-3, address_box.top-3, address_box.width+5, 25,border_color);
+	DefineButton(address_box.left-52, address_box.top-2, 24, skin.h-2, BACK_BUTTON+BT_HIDE, 0);
+	DefineButton(address_box.left-27, address_box.top-2, 24, skin.h-2, FORWARD_BUTTON+BT_HIDE, 0);
+	img_draw stdcall(skin.image, address_box.left-53, address_box.top-3, 51, skin.h, 3, 0);
 	DefineButton(address_box.left+address_box.width+1, address_box.top-3, 16, skin.h-1, REFRESH_BUTTON+BT_HIDE+BT_NOFRAME, 0);
-	DefineButton(Form.cwidth-24, address_box.top-3, 19, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0);
-	img_draw stdcall(skin.image, Form.cwidth-22, address_box.top-3, 16, skin.h, 85, 0);
+	DefineButton(Form.cwidth-27, address_box.top-3, 23, skin.h-1, SANDWICH_BUTTON+BT_HIDE, 0);
+	img_draw stdcall(skin.image, Form.cwidth-24, address_box.top-3, 17, skin.h, 87, 0);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
 	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBoxWebView(); }
@@ -392,7 +392,7 @@ void StopLoading()
 		bufpointer = free(bufpointer);
 	}
 	wv_progress_bar.value = 0;
-	img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, 52, 0);
+	DrawEditBoxWebView();
 }
 
 void SetPageDefaults()
@@ -451,11 +451,12 @@ void OpenPage()
 
 DrawEditBoxWebView()
 {
-	DrawWideRectangle(address_box.left-2, address_box.top-2, address_box.width+3, 19, 2, address_box.color);
+	DrawBar(address_box.left-2, address_box.top-2, address_box.width+3, 2, address_box.color);
+	DrawBar(address_box.left-2, address_box.top, 2, 22, address_box.color);
 	address_box.size = address_box.pos = address_box.shift = address_box.shift_old = strlen(#editURL);
 	address_box.offset = 0;
 	edit_box_draw stdcall(#address_box);
-	if (http_transfer > 0) EAX = 131; else EAX = 52;
+	if (http_transfer > 0) EAX = 131; else EAX = 54;
 	img_draw stdcall(skin.image, address_box.left+address_box.width+1, address_box.top-3, 17, skin.h, EAX, 0);
 }
 
@@ -500,7 +501,7 @@ void DrawProgress()
 	unsigned long btn;
 	if (http_transfer == 0) return;
 	if (wv_progress_bar.max) btn = address_box.width*wv_progress_bar.value/wv_progress_bar.max; else btn = 30;
-	DrawBar(address_box.left-2, address_box.top+15, btn, 2, wv_progress_bar.progress_color);
+	DrawBar(address_box.left-2, address_box.top+20, btn, 2, wv_progress_bar.progress_color);
 }
 
 void ClickLink()
@@ -541,9 +542,9 @@ void ClickLink()
 		return;
 	}
 
-	if (!strcmp(#URL,"https://"))
+	if (!strncmp(#URL,"https://",8))
 	{
-		notify("HTTPS protocol is not supported yet");	
+		notify("'HTTPS protocol is not supported yet' -E");	
 	}
 	
 	GetAbsoluteURL(#URL);
diff --git a/programs/cmm/browser/wv_skin.png b/programs/cmm/browser/wv_skin.png
index f1936cc945fe20ad753eca7f8bd896645c1ccf5e..ec43b12869af865034444df29f063ca260e72671 100644
GIT binary patch
literal 2168
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

literal 2058
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