[LyX/master] Use underline in (+ bold) for char match in layout

[Scott Kostyshak]

commit 73b1c658a24dcdc6ecb73889174301660bfeaa62
Author: Scott Kostyshak <skost...@lyx.org>
Date:   Mon Oct 22 21:16:56 2018 -0400

    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
---
 src/frontends/qt4/CategorizedCombo.cpp |    2 +-
 src/frontends/qt4/LayoutBox.cpp        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index 60d6ba9..89b28cd 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 528e4d0..7d0cfd6 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;
 }