noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1207 from 23rd/patch-35-empty-headers

Browse source 
Improved stream header creation.
This commit is contained in:
pajlada 2019-08-17 11:03:12 +02:00 committed by GitHub
parent 352d5729cc f9e9ed8ed0
commit 246d24d616
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/widgets/splits/SplitHeader.cpp
View file

@ -77,20 +77,15 @@ namespace {
}
auto formatTooltip(const TwitchChannel::StreamStatus &s)
{
return QStringList{"<style>.center { text-align: center; }</style>",
"<p class=\"center\">",
s.title.toHtmlEscaped(),
"<br><br>",
s.game.toHtmlEscaped(),
"<br>",
s.rerun ? "Vod-casting" : "Live",
" for ",
s.uptime,
" with ",
QString::number(s.viewerCount),
" viewers",
"</p>"}
.join("");
return QString("<style>.center { text-align: center; }</style> \
<p class=\"center\">%1%2%3%4%5 for %6 with %7 viewers</p>")
.arg(s.title.toHtmlEscaped())
.arg(s.title.isEmpty() ? QString() : "<br><br>")
.arg(s.game.toHtmlEscaped())
.arg(s.game.isEmpty() ? QString() : "<br>")
.arg(s.rerun ? "Vod-casting" : "Live")
.arg(s.uptime)
.arg(QString::number(s.viewerCount));
}
auto formatTitle(const TwitchChannel::StreamStatus &s, Settings &settings)
{
@ -109,9 +104,9 @@ namespace {
title += " - " + s.uptime;
if (settings.headerViewerCount)
title += " - " + QString::number(s.viewerCount);
if (settings.headerGame)
if (settings.headerGame && !s.game.isEmpty())
title += " - " + s.game;
if (settings.headerStreamTitle)
if (settings.headerStreamTitle && !s.title.isEmpty())
title += " - " + s.title;
return title;