FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong word wrap mode for plain-text-based feeds, fixes #900

Browse Source
This commit is contained in:
Martin Rotter 2023-03-17 08:12:46 +01:00
parent eeedf8b1a5
commit c1f5029e8b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
View File

@ -29,6 +29,8 @@ TextBrowserViewer::TextBrowserViewer(QWidget* parent)
setFrameShadow(QFrame::Shadow::Plain); setFrameShadow(QFrame::Shadow::Plain);
setTabChangesFocus(true); setTabChangesFocus(true);
setOpenLinks(false); setOpenLinks(false);
setWordWrapMode(QTextOption::WrapMode::WordWrap);
viewport()->setAutoFillBackground(true); viewport()->setAutoFillBackground(true);
setResourcesEnabled(qApp->settings()->value(GROUP(Messages), SETTING(Messages::ShowResourcesInArticles)).toBool()); setResourcesEnabled(qApp->settings()->value(GROUP(Messages), SETTING(Messages::ShowResourcesInArticles)).toBool());
@ -123,7 +125,8 @@ PreparedHtml TextBrowserViewer::prepareHtmlForMessage(const QList<Message>& mess
} }
// Append actual contents of article and convert to HTML if needed. // Append actual contents of article and convert to HTML if needed.
html.m_html += is_plain ? Qt::convertFromPlainText(message.m_contents) : message.m_contents; html.m_html += is_plain ? Qt::convertFromPlainText(message.m_contents, Qt::WhiteSpaceMode::WhiteSpaceNormal)
: message.m_contents;
static QRegularExpression img_tag_rgx("\\<img[^\\>]*src\\s*=\\s*[\"\']([^\"\']*)[\"\'][^\\>]*\\>", static QRegularExpression img_tag_rgx("\\<img[^\\>]*src\\s*=\\s*[\"\']([^\"\']*)[\"\'][^\\>]*\\>",
QRegularExpression::PatternOption::CaseInsensitiveOption | QRegularExpression::PatternOption::CaseInsensitiveOption |

6
src/librssguard/miscellaneous/skinfactory.cpp
View File

@ -193,8 +193,10 @@ QPair<QString, QUrl> SkinFactory::generateHtmlOfArticles(const QList<Message>& m
? tr("unknown author") ? tr("unknown author")
: message.m_author), : message.m_author),
message.m_url, message.m_url,
is_plain ? Qt::convertFromPlainText(message.m_contents) is_plain
: message.m_contents, ? Qt::convertFromPlainText(message.m_contents,
Qt::WhiteSpaceMode::WhiteSpaceNormal)
: message.m_contents,
msg_date, msg_date,
enclosures, enclosures,
enclosure_images, enclosure_images,