From: Scott Kostyshak <skostysh@lyx.org>
Date: Tue, 23 Oct 2018 01:16:56 +0000 (-0400)
Subject: Use underline in (+ bold) for char match in layout
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2959
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=73b1c658a24dcdc6ecb73889174301660bfeaa62;p=features.git

Use underline in (+ bold) for char match in layout

When showing the match characters in, e.g., the layout box, we now
underline (in addition to bold) the matched characters. This makes
the matched characters stand out even more.

See 4b716dd6 and the following ML thread:

  https://www.mail-archive.com/search?l=mid&q=20181019155649.dqqk6u25wdcdimrj%40barna
---

diff --git a/src/frontends/qt4/CategorizedCombo.cpp b/src/frontends/qt4/CategorizedCombo.cpp
index 60d6ba98f0..89b28cd3bd 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -270,7 +270,7 @@ QString CCItemDelegate::underlineFilter(QString const & s) const
 		return s;
 	QString r(s);
 	QRegExp pattern(charFilterRegExpC(f));
-	r.replace(pattern, "<b>\\1</b>");
+	r.replace(pattern, "<u><b>\\1</b></u>");
 	return r;
 }
 
diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp
index 528e4d06ab..7d0cfd666f 100644
--- a/src/frontends/qt4/LayoutBox.cpp
+++ b/src/frontends/qt4/LayoutBox.cpp
@@ -301,7 +301,7 @@ QString LayoutItemDelegate::underlineFilter(QString const & s) const
 		return s;
 	QString r(s);
 	QRegExp pattern(charFilterRegExpC(f));
-	r.replace(pattern, "<b>\\1</b>");
+	r.replace(pattern, "<u><b>\\1</b></u>");
 	return r;
 }