From 43c32e08ffe73abd42f2d78aec8b554ee6dcaa7d Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sat, 16 May 2020 22:01:17 +0000
Subject: [PATCH] WebView: fix parsetag @menu: better contrast for skins with
 sc.work equal to 0x000000

git-svn-id: svn://kolibrios.org@7935 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/TWB/parse_tag.h        | 2 +-
 programs/cmm/browser/texts.h        | 2 +-
 programs/cmm/quark/prepare_page.h   | 4 ++--
 programs/system/menu/trunk/menu.asm | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/programs/cmm/TWB/parse_tag.h b/programs/cmm/TWB/parse_tag.h
index f328c62b1e..60669753d1 100644
--- a/programs/cmm/TWB/parse_tag.h
+++ b/programs/cmm/TWB/parse_tag.h
@@ -97,7 +97,6 @@ bool _tag::get_next_param()
 	//find ATTR start and copy
 	while (i>0) && (!__isWhite(params[i])) i--;
 	strlcpy(#attr, #params + i + 1, sizeof(attr)-1);
-	strlwr(#attr);
 	params[i] = '\0';
  
 	//fix case: src=./images/KolibriOS_logo2.jpg?sid=e8ece8b38b
@@ -106,6 +105,7 @@ bool _tag::get_next_param()
 		strlcpy(#val, i+1, sizeof(val)-1);
 		ESBYTE[i+1] = '\0';
 	}
+	strlwr(#attr);
 
 	attributes.add(#attr);
 	values.add(#val);
diff --git a/programs/cmm/browser/texts.h b/programs/cmm/browser/texts.h
index 0a945bc0de..bcfc1e0978 100644
--- a/programs/cmm/browser/texts.h
+++ b/programs/cmm/browser/texts.h
@@ -1,4 +1,4 @@
-char version[]="WebView 2.5";
+char version[]="WebView 2.5b";
 
 #ifdef LANG_RUS
 char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";
diff --git a/programs/cmm/quark/prepare_page.h b/programs/cmm/quark/prepare_page.h
index 6746d69fd4..edea4931af 100644
--- a/programs/cmm/quark/prepare_page.h
+++ b/programs/cmm/quark/prepare_page.h
@@ -51,7 +51,7 @@ void PaintVisible()
 	dword line_bg;
 	bool swapped_selection = false;
 
-	list.column_max = lines.get(list.cur_y+1) - lines.get(list.cur_y);
+	list.column_max = lines.len(list.cur_y);
 	list.CheckDoesValuesOkey();
 	if (selection.end_offset < selection.start_offset) {
 		swapped_selection = selection.swap_start_end();
@@ -69,7 +69,7 @@ void PaintVisible()
 		selection.draw(absolute_y);
 
 		if (absolute_y<list.count) DrawBuf.WriteText(3, ydraw+3, list.font_type, theme.text, 
-			lines.get(absolute_y), lines.get(absolute_y+1) - lines.get(absolute_y));
+			lines.get(absolute_y), lines.len(absolute_y));
 	}
 
 	PutPaletteImage(buf_data+8, DrawBuf.bufw, list.h, list.x, list.y, 32, 0);
diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm
index f0a23d21c6..921d3df6d9 100644
--- a/programs/system/menu/trunk/menu.asm
+++ b/programs/system/menu/trunk/menu.asm
@@ -841,6 +841,10 @@ nocorrect:
 	inc	dl
 	cmp	[edi + cur_sel],dl
 	jne	.nohighlight
+	cmp esi,0
+	jne @f
+	mov esi,0x2a2a2a
+@@:
 	add	esi,0x1a1a1a
 ;--------------------------------------
 align 4