From 50bcfc998bfa80021f6ac12645eebd6886121a71 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 7 Nov 2016 20:57:40 +0000
Subject: [PATCH] WebView 1.49: two bugs fixed

git-svn-id: svn://kolibrios.org@6686 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/TWB/TWB.c                  | 5 ++---
 programs/cmm/browser/WebView.c          | 4 ++--
 programs/cmm/lib/patterns/select_list.h | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/programs/cmm/TWB/TWB.c b/programs/cmm/TWB/TWB.c
index c9f1a7f280..30763f249a 100644
--- a/programs/cmm/TWB/TWB.c
+++ b/programs/cmm/TWB/TWB.c
@@ -188,7 +188,7 @@ void TWebBrowser::Prepare(){
 				if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
 				if (!ignor_param) && (bukva <>' ')
 				{
-					if (strlen(#tag)<sizeof(tag)) chrcat(#tag, bukva);
+					if (strlen(#tag)+1<sizeof(tag)) chrcat(#tag, bukva);
 				}
 				else
 				{
@@ -201,12 +201,11 @@ void TWebBrowser::Prepare(){
 
 			if (tag[strlen(#tag)-1]=='/') tag[strlen(#tag)-1]=NULL; //for br/
 			if (tagparam) GetNextParam();
-
 			Perenos();
 			DrawStyle();
 			line = NULL;
 			if (tag) SetStyle(); //юсЁрсюЄър Єхуют
-			strcpy(#oldtag, #tag);
+			strlcpy(#oldtag, #tag, sizeof(oldtag));
 			tag = attr = tagparam = ignor_param = NULL;
 			break;
 		default:
diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c
index 411e210a96..e0126de2de 100644
--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -31,7 +31,7 @@
 char homepage[] = FROM "html\\homepage.htm";
 
 #ifdef LANG_RUS
-char version[]=" Текстовый браузер 1.48";
+char version[]=" Текстовый браузер 1.49";
 ?define IMAGES_CACHE_CLEARED "Кэш картинок очищен"
 ?define T_LAST_SLIDE "Это последний слайд"
 char loading[] = "Загрузка страницы...<br>";
@@ -269,7 +269,7 @@ void SetElementSizes()
 	WB1.list.column_max = WB1.list.w - scroll_wv.size_x / WB1.list.font_w;
 	WB1.list.visible = WB1.list.h - 5 / WB1.list.item_h;
 	if (WB1.list.w!=WB1.DrawBuf.bufw) {
-		WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, WB1.list.h * 30);
+		WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 4096 * 7400 / WB1.list.w);
 		Scan(REFRESH_BUTTON);
 	}
 }
diff --git a/programs/cmm/lib/patterns/select_list.h b/programs/cmm/lib/patterns/select_list.h
index 9f65929e72..6403687dad 100644
--- a/programs/cmm/lib/patterns/select_list.h
+++ b/programs/cmm/lib/patterns/select_list.h
@@ -52,7 +52,10 @@ void SelectList_ProcessMouse()
 }
 
 void SelectList_DrawBorder() {
-	DrawRectangle3D(select_list.x-2, select_list.y-2, select_list.w+3+scroll1.size_x, select_list.h+3, system.color.work_dark, system.color.work_light);
+	DrawRectangle3D(select_list.x-2, select_list.y-2,
+		select_list.w+3+scroll1.size_x, select_list.h+3, 
+		MixColors(system.color.work, system.color.work_dark, 125), 
+		system.color.work_light);
 	DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, system.color.work_graph);
 }