lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-17 11:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect font scale for fixed-width fonts

Browse Source
This commit is contained in:
baldurk
2021-04-12 13:04:02 +01:00
parent 34ea6529c9
commit 95e6a4a971
14 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/QRDUtils.cpp
+6
View File
@@ -2075,8 +2075,10 @@ int Formatter::m_minFigures = 2, Formatter::m_maxFigures = 5, Formatter::m_expNe
double Formatter::m_expNegValue = 0.00001; // 10^(-5)
double Formatter::m_expPosValue = 10000000.0; // 10^7
QFont *Formatter::m_Font = NULL;
QFont *Formatter::m_FixedFont = NULL;
float Formatter::m_FontBaseSize = 10.0f; // this should always be overridden below, but just in
// case let's pick a sensible value
float Formatter::m_FixedFontBaseSize = 10.0f;
QColor Formatter::m_DarkChecker, Formatter::m_LightChecker;
void Formatter::setParams(const PersistantConfig &config)
@@ -2093,6 +2095,8 @@ void Formatter::setParams(const PersistantConfig &config)
{
m_Font = new QFont();
m_FontBaseSize = QApplication::font().pointSizeF();
m_FixedFont = new QFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
m_FixedFontBaseSize = m_FixedFont->pointSizeF();
}
*m_Font =
@@ -2103,6 +2107,8 @@ void Formatter::setParams(const PersistantConfig &config)
f.setPointSizeF(m_FontBaseSize * config.Font_GlobalScale);
QApplication::setFont(f);
m_FixedFont->setPointSizeF(m_FixedFontBaseSize * config.Font_GlobalScale);
Formatter::setPalette(QApplication::palette());
}
qrenderdoc/Code/QRDUtils.h
+3 -2
View File
@@ -256,13 +256,14 @@ struct Formatter
static QString Format(int32_t i, bool hex = false) { return QString::number(i); }
static QString Format(int64_t i, bool hex = false) { return QString::number(i); }
static const QFont &PreferredFont() { return *m_Font; }
static const QFont &FixedFont() { return *m_FixedFont; }
static const QColor DarkCheckerColor() { return m_DarkChecker; }
static const QColor LightCheckerColor() { return m_LightChecker; }
private:
static int m_minFigures, m_maxFigures, m_expNegCutoff, m_expPosCutoff;
static double m_expNegValue, m_expPosValue;
static QFont *m_Font;
static float m_FontBaseSize;
static QFont *m_Font, *m_FixedFont;
static float m_FontBaseSize, m_FixedFontBaseSize;
static QColor m_DarkChecker, m_LightChecker;
};
qrenderdoc/Code/ScintillaSyntax.cpp
-1
View File
@@ -245,7 +245,6 @@ void ConfigureSyntax(ScintillaEdit *scintilla, int language)
}
scintilla->setLexer(language);
scintilla->styleSetSize(STYLE_DEFAULT, 10);
#define SC_COL(qcol) SCINTILLA_COLOUR(qcol.red(), qcol.green(), qcol.blue())
qrenderdoc/Widgets/BufferFormatSpecifier.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ BufferFormatSpecifier::BufferFormatSpecifier(QWidget *parent)
setErrors(QString());
ui->formatText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->formatText->setFont(Formatter::FixedFont());
}
BufferFormatSpecifier::~BufferFormatSpecifier()
qrenderdoc/Windows/BufferViewer.cpp
+5 -5
View File
@@ -2008,12 +2008,12 @@ BufferViewer::BufferViewer(ICaptureContext &ctx, bool meshview, QWidget *parent)
ui->outputTabs->setCurrentIndex(0);
m_CurStage = MeshDataStage::VSIn;
ui->vsinData->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->vsoutData->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->gsoutData->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->vsinData->setFont(Formatter::FixedFont());
ui->vsoutData->setFont(Formatter::FixedFont());
ui->gsoutData->setFont(Formatter::FixedFont());
ui->minBoundsLabel->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->maxBoundsLabel->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->minBoundsLabel->setFont(Formatter::FixedFont());
ui->maxBoundsLabel->setFont(Formatter::FixedFont());
ui->rowOffset->setFont(Formatter::PreferredFont());
ui->instance->setFont(Formatter::PreferredFont());
qrenderdoc/Windows/CommentView.cpp
+2 -2
View File
@@ -25,6 +25,7 @@
#include "CommentView.h"
#include <QFontDatabase>
#include <QRegularExpression>
#include "Code/QRDUtils.h"
#include "Code/ScintillaSyntax.h"
#include "scintilla/include/SciLexer.h"
#include "scintilla/include/qt/ScintillaEdit.h"
@@ -39,8 +40,7 @@ CommentView::CommentView(ICaptureContext &ctx, QWidget *parent)
m_commentsEditor = new ScintillaEdit(this);
m_commentsEditor->styleSetFont(
STYLE_DEFAULT, QFontDatabase::systemFont(QFontDatabase::FixedFont).family().toUtf8().data());
m_commentsEditor->styleSetFont(STYLE_DEFAULT, Formatter::FixedFont().family().toUtf8().data());
m_commentsEditor->setTabWidth(4);
m_commentsEditor->setWrapMode(SC_WRAP_WORD);
qrenderdoc/Windows/ConstantBufferPreviewer.cpp
+2 -1
View File
@@ -25,6 +25,7 @@
#include "ConstantBufferPreviewer.h"
#include <QFontDatabase>
#include <QTextStream>
#include "Code/QRDUtils.h"
#include "toolwindowmanager/ToolWindowManager.h"
#include "ui_ConstantBufferPreviewer.h"
@@ -56,7 +57,7 @@ ConstantBufferPreviewer::ConstantBufferPreviewer(ICaptureContext &ctx, const Sha
ui->variables->header()->setSectionResizeMode(2, QHeaderView::Interactive);
}
ui->variables->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->variables->setFont(Formatter::FixedFont());
m_Previews.push_back(this);
m_Ctx.AddCaptureViewer(this);
qrenderdoc/Windows/Dialogs/AnalyticsConfirmDialog.cpp
+2 -1
View File
@@ -28,6 +28,7 @@
#include <QPushButton>
#include <QUrl>
#include "Code/Interface/QRDInterface.h"
#include "Code/QRDUtils.h"
#include "ui_AnalyticsConfirmDialog.h"
AnalyticsConfirmDialog::AnalyticsConfirmDialog(QString report, QWidget *parent)
@@ -37,7 +38,7 @@ AnalyticsConfirmDialog::AnalyticsConfirmDialog(QString report, QWidget *parent)
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
ui->analyticsReport->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->analyticsReport->setFont(Formatter::FixedFont());
ui->analyticsReport->setText(report);
QObject::connect(ui->buttonBox->button(QDialogButtonBox::Discard), &QPushButton::clicked, this,
qrenderdoc/Windows/Dialogs/EnvironmentEditor.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ EnvironmentEditor::EnvironmentEditor(QWidget *parent)
ui->variables->sortByColumn(0, Qt::DescendingOrder);
ui->variables->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->variables->setFont(Formatter::FixedFont());
}
EnvironmentEditor::~EnvironmentEditor()
qrenderdoc/Windows/LogView.cpp
+1 -1
View File
@@ -290,7 +290,7 @@ LogView::LogView(ICaptureContext &ctx, QWidget *parent)
ui->messages->setMouseTracking(true);
ui->messages->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->messages->setFont(Formatter::FixedFont());
m_TypeModel = new QStandardItemModel(0, 1, this);
qrenderdoc/Windows/PythonShell.cpp
+6 -6
View File
@@ -27,6 +27,7 @@
#include <QKeyEvent>
#include <QMenu>
#include <QScrollBar>
#include "Code/QRDUtils.h"
#include "Code/ScintillaSyntax.h"
#include "Code/pyrenderdoc/PythonContext.h"
#include "scintilla/include/SciLexer.h"
@@ -823,17 +824,16 @@ PythonShell::PythonShell(ICaptureContext &ctx, QWidget *parent)
QObject::connect(ui->lineInput, &RDLineEdit::keyPress, this, &PythonShell::interactive_keypress);
QObject::connect(ui->helpSearch, &RDLineEdit::keyPress, this, &PythonShell::helpSearch_keypress);
ui->lineInput->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->interactiveOutput->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->scriptOutput->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->helpText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->lineInput->setFont(Formatter::FixedFont());
ui->interactiveOutput->setFont(Formatter::FixedFont());
ui->scriptOutput->setFont(Formatter::FixedFont());
ui->helpText->setFont(Formatter::FixedFont());
ui->lineInput->setAcceptTabCharacters(true);
scriptEditor = new ScintillaEdit(this);
scriptEditor->styleSetFont(
STYLE_DEFAULT, QFontDatabase::systemFont(QFontDatabase::FixedFont).family().toUtf8().data());
scriptEditor->styleSetFont(STYLE_DEFAULT, Formatter::FixedFont().family().toUtf8().data());
scriptEditor->setMarginLeft(4.0 * devicePixelRatioF());
scriptEditor->setMarginWidthN(0, 32.0 * devicePixelRatioF());
qrenderdoc/Windows/ShaderViewer.cpp
+2 -2
View File
@@ -1175,8 +1175,8 @@ ScintillaEdit *ShaderViewer::MakeEditor(const QString &name, const QString &text
ret->setMarginWidthN(2, 16.0 * devicePixelRatioF());
ret->setObjectName(name);
ret->styleSetFont(STYLE_DEFAULT,
QFontDatabase::systemFont(QFontDatabase::FixedFont).family().toUtf8().data());
ret->styleSetFont(STYLE_DEFAULT, Formatter::FixedFont().family().toUtf8().data());
ret->styleSetSize(STYLE_DEFAULT, Formatter::FixedFont().pointSize());
// C# DarkGreen
ret->indicSetFore(INDICATOR_REGHIGHLIGHT, SCINTILLA_COLOUR(0, 100, 0));
qrenderdoc/Windows/StatisticsViewer.cpp
+1 -1
View File
@@ -820,7 +820,7 @@ StatisticsViewer::StatisticsViewer(ICaptureContext &ctx, QWidget *parent)
{
ui->setupUi(this);
ui->statistics->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->statistics->setFont(Formatter::FixedFont());
m_Ctx.AddCaptureViewer(this);
}
qrenderdoc/Windows/TextureViewer.cpp
+5 -5
View File
@@ -610,11 +610,11 @@ TextureViewer::TextureViewer(ICaptureContext &ctx, QWidget *parent)
statusflow->addWidget(ui->hoverText);
statusflow->addWidget(ui->pickedText);
ui->texStatusName->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->texStatusDim->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->texStatusFormat->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->hoverText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->pickedText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->texStatusName->setFont(Formatter::FixedFont());
ui->texStatusDim->setFont(Formatter::FixedFont());
ui->texStatusFormat->setFont(Formatter::FixedFont());
ui->hoverText->setFont(Formatter::FixedFont());
ui->pickedText->setFont(Formatter::FixedFont());
ui->renderLayout->removeItem(ui->statusbar);
ui->renderLayout->addItem(statusflow);