diff options
| author | Brendan Long <self@brendanlong.com> | 2019-07-13 21:55:53 +0300 |
|---|---|---|
| committer | Brendan Long <self@brendanlong.com> | 2019-07-13 22:04:50 +0300 |
| commit | b7230c4ee726107e57a9d0bb822d4e971603515d (patch) | |
| tree | c2da2b395fd1f07f134c38db9de619d1ef95e4f4 | |
| parent | c782cedfe530908cad9fb3ece599eee024675669 (diff) | |
Display feed and article titles as markup
This makes it so we can use the escaped-HTML output of Htmlclean
directly as titles, and things like <pre> will show as <pre>
in titles.
See #918
| -rw-r--r-- | src/Widgets/ArticleRow.vala | 12 | ||||
| -rw-r--r-- | src/Widgets/FeedRow.vala | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/Widgets/ArticleRow.vala b/src/Widgets/ArticleRow.vala index 9b20a005..abb5fe48 100644 --- a/src/Widgets/ArticleRow.vala +++ b/src/Widgets/ArticleRow.vala @@ -82,7 +82,8 @@ public class FeedReader.ArticleRow : Gtk.ListBoxRow { m_unread_stack.set_transition_duration(50); m_marked_stack.set_transition_duration(50); - m_label = new Gtk.Label(m_article.getTitle()); + m_label = new Gtk.Label(null); + m_label.set_markup(m_article.getTitle()); m_label.set_line_wrap_mode(Pango.WrapMode.WORD); m_label.set_line_wrap(true); m_label.set_lines(2); @@ -185,7 +186,8 @@ public class FeedReader.ArticleRow : Gtk.ListBoxRow { } - var body_label = new Gtk.Label(short_preview); + var body_label = new Gtk.Label(null); + body_label.set_markup(short_preview); body_label.opacity = 0.7; body_label.get_style_context().add_class("preview"); body_label.set_alignment(0.0f, 0.0f); @@ -195,7 +197,11 @@ public class FeedReader.ArticleRow : Gtk.ListBoxRow { body_label.set_lines(2); var feed = DataBase.readOnly().read_feed(m_article.getFeedID()); - var feedLabel = new Gtk.Label(feed != null ? feed.getTitle() : ""); + var feedLabel = new Gtk.Label(null); + if (feed != null) + { + feedLabel.set_markup(feed.getTitle()); + } feedLabel.get_style_context().add_class("preview"); feedLabel.opacity = 0.6; feedLabel.set_alignment(0.0f, 0.5f); diff --git a/src/Widgets/FeedRow.vala b/src/Widgets/FeedRow.vala index e730e016..7605345a 100644 --- a/src/Widgets/FeedRow.vala +++ b/src/Widgets/FeedRow.vala @@ -46,7 +46,8 @@ public class FeedReader.FeedRow : Gtk.ListBoxRow { m_icon = createFavIcon(); m_icon.margin_start = level * 24; - m_label = new Gtk.Label(m_feed.getTitle()); + m_label = new Gtk.Label(null); + m_label.set_markup(m_feed.getTitle()); m_label.set_size_request (0, rowhight); m_label.set_ellipsize (Pango.EllipsizeMode.END); m_label.set_alignment(0, 0.5f); |