From f07f30b6753fb3f9e6db38236aee4cf8efa29df9 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Wed, 15 Apr 2020 19:22:26 +0000
Subject: [PATCH] mouse: fix; webview support bold text in docx

git-svn-id: svn://kolibrios.org@7797 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/TWB/TWB.c       | 3 ++-
 programs/cmm/browser/texts.h | 2 +-
 programs/cmm/menu/menu.c     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/cmm/TWB/TWB.c b/programs/cmm/TWB/TWB.c
index 02065ad775..0723778f4d 100644
--- a/programs/cmm/TWB/TWB.c
+++ b/programs/cmm/TWB/TWB.c
@@ -346,10 +346,11 @@ void TWebBrowser::SetStyle() {
 		return;
 	}
 	if (tag.is("br")) { NewLine(); return; }
-	if (tag.is("b")) || (tag.is("strong")) || (tag.is("big")) { 
+	if (tag.is("b")) || (tag.is("strong")) || (tag.is("big")) || (tag.is("w:b")) { 
 		style.b = tag.opened; 
 		return; 
 	}
+	if (tag.is("w:r")) && (!tag.opened) { style.b = false; return; }
 	if (tag.is("a")) {
 		if (tag.opened)
 		{
diff --git a/programs/cmm/browser/texts.h b/programs/cmm/browser/texts.h
index 0915a4e3ba..7848f532e8 100644
--- a/programs/cmm/browser/texts.h
+++ b/programs/cmm/browser/texts.h
@@ -1,4 +1,4 @@
-char version[]="WebView 2.46b";
+char version[]="WebView 2.46d";
 
 #ifdef LANG_RUS
 char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0";
diff --git a/programs/cmm/menu/menu.c b/programs/cmm/menu/menu.c
index 02d73d61ec..cda4c23aec 100644
--- a/programs/cmm/menu/menu.c
+++ b/programs/cmm/menu/menu.c
@@ -97,6 +97,7 @@ int MoveMouseToHandleSeparators(int _mouse_y)
 			return item_i * ITEM_H + menu1.y;
 		}
 	}
+	return _mouse_y;
 }
 
 void main()