mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
[Fonts] Migrate ChatLog surfaces to theme font role (#7537)
* [Fonts] Migrate ChatLog surfaces to theme font role * [Fonts] Keep ChatView on the app font and share the report log font - ChatLog's unset fallback is qApp->font() again: ChatView never set a font before the role existed, so an unset role must not switch chat and the game log to monospace at the system GeneralFont size. - Move the monospace fallback the report dialogs used before into report_utils::reportLogFont(), which returns the theme's ChatLog role when it is set and the old monospace otherwise. tab_report, dlg_my_reports and dlg_report_user now share it, so they cannot drift and they honour a themed size instead of overriding it. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
634f8115a5
commit
7a40ed9079
12 changed files with 89 additions and 7 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#include "report_utils.h"
|
||||
|
||||
#include "../../theme_manager.h"
|
||||
#include "libcockatrice/protocol/pb/serverinfo_report.pb.h"
|
||||
|
||||
#include <QApplication>
|
||||
|
|
@ -7,6 +8,7 @@
|
|||
#include <QChar>
|
||||
#include <QColor>
|
||||
#include <QDateTime>
|
||||
#include <QFontDatabase>
|
||||
#include <QPalette>
|
||||
#include <QSharedPointer>
|
||||
#include <QTableWidget>
|
||||
|
|
@ -19,6 +21,20 @@
|
|||
namespace report_utils
|
||||
{
|
||||
|
||||
QFont reportLogFont()
|
||||
{
|
||||
if (themeManager->hasAppFont(AppFont::ChatLog)) {
|
||||
return themeManager->appFont(AppFont::ChatLog);
|
||||
}
|
||||
QFont monoFont(QStringLiteral("monospace"));
|
||||
monoFont.setStyleHint(QFont::Monospace);
|
||||
const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
|
||||
if (systemPointSize > 0) {
|
||||
monoFont.setPointSize(systemPointSize);
|
||||
}
|
||||
return monoFont;
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
QColor reportStatusColor(const QString &status)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef REPORT_UTILS_H
|
||||
#define REPORT_UTILS_H
|
||||
|
||||
#include <QFont>
|
||||
#include <QString>
|
||||
#include <QtGlobal>
|
||||
|
||||
|
|
@ -11,6 +12,12 @@ class ServerInfo_Report;
|
|||
namespace report_utils
|
||||
{
|
||||
|
||||
/** @brief Font for the report chat-log views: the theme's ChatLog role when it
|
||||
* sets one, otherwise the monospace font these views used before the
|
||||
* role existed. Shared by the three report surfaces so they cannot
|
||||
* drift apart. */
|
||||
QFont reportLogFont();
|
||||
|
||||
QString formatReportCategory(const QString &category);
|
||||
QString formatReportTime(qint64 secondsSinceEpoch);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue