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

Implement the UI option for preferring monospaced font

Browse Source
This commit is contained in:
baldurk
2017-05-04 16:00:51 +01:00
parent 0b868e45c0
commit ab432f24fc
20 changed files with 238 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/PersistantConfig.cpp
+1 -10
View File
@@ -247,16 +247,7 @@ bool PersistantConfig::Save()
void PersistantConfig::SetupFormatting()
{
Formatter::setParams(Formatter_MinFigures, Formatter_MaxFigures, Formatter_NegExp,
Formatter_PosExp);
// TODO Preferred Font
/*
PreferredFont = Font_PreferMonospaced
? new System.Drawing.Font("Consolas", 9.25F, System.Drawing.FontStyle.Regular,
System.Drawing.GraphicsUnit.Point, ((byte)(0)))
: new System.Drawing.Font("Tahoma", 8.25F);
*/
Formatter::setParams(*this);
}
void AddRecentFile(QList<QString> &recentList, const QString &file, int maxItems)
qrenderdoc/Code/QRDUtils.cpp
+12 -7
View File
@@ -25,6 +25,7 @@
#include "QRDUtils.h"
#include <QApplication>
#include <QFileSystemModel>
#include <QFontDatabase>
#include <QGridLayout>
#include <QGuiApplication>
#include <QJsonDocument>
@@ -545,16 +546,20 @@ int Formatter::m_minFigures = 2, Formatter::m_maxFigures = 5, Formatter::m_expNe
Formatter::m_expPosCutoff = 7;
double Formatter::m_expNegValue = 0.00001; // 10^(-5)
double Formatter::m_expPosValue = 10000000.0; // 10^7
QFont Formatter::m_Font;
void Formatter::setParams(int minFigures, int maxFigures, int expNegCutoff, int expPosCutoff)
void Formatter::setParams(const PersistantConfig &config)
{
m_minFigures = qMax(0, minFigures);
m_maxFigures = qMax(2, maxFigures);
m_expNegCutoff = qMax(0, expNegCutoff);
m_expPosCutoff = qMax(0, expPosCutoff);
m_minFigures = qMax(0, config.Formatter_MinFigures);
m_maxFigures = qMax(2, config.Formatter_MaxFigures);
m_expNegCutoff = qMax(0, config.Formatter_NegExp);
m_expPosCutoff = qMax(0, config.Formatter_PosExp);
m_expNegValue = qPow(10.0, -m_expNegCutoff);
m_expPosValue = qPow(10.0, m_expPosCutoff);
m_expNegValue = qPow(10.0, -config.Formatter_NegExp);
m_expPosValue = qPow(10.0, config.Formatter_PosExp);
m_Font =
config.Font_PreferMonospaced ? QFontDatabase::systemFont(QFontDatabase::FixedFont) : QFont();
}
QString Formatter::Format(double f, bool)
qrenderdoc/Code/QRDUtils.h
+3 -1
View File
@@ -624,7 +624,7 @@ QString GetComponentString(byte mask);
struct Formatter
{
static void setParams(int minFigures, int maxFigures, int expNegCutoff, int expPosCutoff);
static void setParams(const PersistantConfig &config);
static QString Format(double f, bool hex = false);
static QString Format(uint64_t u, bool hex = false)
@@ -640,9 +640,11 @@ struct Formatter
return QFormatStr("%1").arg(u, hex ? 4 : 0, hex ? 16 : 10, QLatin1Char('0'));
}
static QString Format(int32_t i, bool hex = false) { return QString::number(i); }
static const QFont &PreferredFont() { return m_Font; }
private:
static int m_minFigures, m_maxFigures, m_expNegCutoff, m_expPosCutoff;
static double m_expNegValue, m_expPosValue;
static QFont m_Font;
};
bool SaveToJSON(QVariantMap &data, QIODevice &f, const char *magicIdentifier, uint32_t magicVersion);
qrenderdoc/Code/pyrenderdoc/qrenderdoc_stub.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
// we only support the qrenderdoc module for docs generation, so it doesn't matter that these stub
// functions aren't valid
void Formatter::setParams(int minFigures, int maxFigures, int expNegCutoff, int expPosCutoff)
void Formatter::setParams(const PersistantConfig &config)
{
}
qrenderdoc/Widgets/ResourcePreview.cpp
+3
View File
@@ -24,6 +24,7 @@
#include "ResourcePreview.h"
#include <QMouseEvent>
#include "Code/QRDUtils.h"
#include "ui_ResourcePreview.h"
ResourcePreview::ResourcePreview(ICaptureContext &c, IReplayOutput *output, QWidget *parent)
@@ -50,8 +51,10 @@ ResourcePreview::ResourcePreview(ICaptureContext &c, IReplayOutput *output, QWid
ui->slotLabel->setAutoFillBackground(true);
ui->slotLabel->setPalette(Pal);
ui->slotLabel->setFont(Formatter::PreferredFont());
ui->descriptionLabel->setAutoFillBackground(true);
ui->descriptionLabel->setPalette(Pal);
ui->descriptionLabel->setFont(Formatter::PreferredFont());
QObject::connect(ui->thumbnail, &CustomPaintWidget::clicked, this, &ResourcePreview::clickEvent);
QObject::connect(ui->slotLabel, &RDLabel::clicked, this, &ResourcePreview::clickEvent);
qrenderdoc/Windows/APIInspector.cpp
+3
View File
@@ -38,6 +38,9 @@ APIInspector::APIInspector(ICaptureContext &ctx, QWidget *parent)
ui->splitter->setCollapsible(1, true);
ui->splitter->setSizes({1, 0});
ui->callstack->setFont(Formatter::PreferredFont());
ui->apiEvents->setFont(Formatter::PreferredFont());
RDSplitterHandle *handle = (RDSplitterHandle *)ui->splitter->handle(1);
handle->setTitle(tr("Callstack"));
handle->setIndex(1);
qrenderdoc/Windows/BufferViewer.cpp
+8
View File
@@ -848,6 +848,14 @@ BufferViewer::BufferViewer(ICaptureContext &ctx, bool meshview, QWidget *parent)
ui->vsoutData->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->gsoutData->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
ui->rowOffset->setFont(Formatter::PreferredFont());
ui->instance->setFont(Formatter::PreferredFont());
ui->camSpeed->setFont(Formatter::PreferredFont());
ui->fovGuess->setFont(Formatter::PreferredFont());
ui->aspectGuess->setFont(Formatter::PreferredFont());
ui->nearGuess->setFont(Formatter::PreferredFont());
ui->farGuess->setFont(Formatter::PreferredFont());
m_ModelVSIn->meshView = m_ModelVSOut->meshView = m_ModelGSOut->meshView = m_MeshView = meshview;
m_ModelVSIn->meshInput = true;
qrenderdoc/Windows/DebugMessageView.cpp
+2
View File
@@ -223,6 +223,8 @@ DebugMessageView::DebugMessageView(ICaptureContext &ctx, QWidget *parent)
QObject::connect(ui->messages, &QWidget::customContextMenuRequested, this,
&DebugMessageView::messages_contextMenu);
ui->messages->setFont(Formatter::PreferredFont());
m_Ctx.AddLogViewer(this);
m_ContextMenu = new QMenu(this);
qrenderdoc/Windows/Dialogs/CaptureDialog.cpp
+5
View File
@@ -65,6 +65,11 @@ CaptureDialog::CaptureDialog(ICaptureContext &ctx, OnCaptureMethod captureCallba
{
ui->setupUi(this);
ui->exePath->setFont(Formatter::PreferredFont());
ui->workDirPath->setFont(Formatter::PreferredFont());
ui->cmdline->setFont(Formatter::PreferredFont());
ui->processList->setFont(Formatter::PreferredFont());
// setup FlowLayout for options group
{
QLayout *oldLayout = ui->optionsGroup->layout();
qrenderdoc/Windows/Dialogs/OrderedListEditor.cpp
+2
View File
@@ -35,6 +35,8 @@ OrderedListEditor::OrderedListEditor(const QString &windowName, const QString &i
{
ui->setupUi(this);
ui->list->setFont(Formatter::PreferredFont());
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
m_BrowseMode = browse;
qrenderdoc/Windows/Dialogs/RemoteManager.cpp
+4
View File
@@ -80,6 +80,10 @@ RemoteManager::RemoteManager(ICaptureContext &ctx, MainWindow *main)
m_ExternalRef.release(1);
ui->hosts->setFont(Formatter::PreferredFont());
ui->hostname->setFont(Formatter::PreferredFont());
ui->runCommand->setFont(Formatter::PreferredFont());
ui->hosts->setColumns({tr("Hostname"), tr("Running")});
ui->hosts->header()->setSectionResizeMode(0, QHeaderView::Stretch);
qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp
+9
View File
@@ -38,6 +38,15 @@ TextureSaveDialog::TextureSaveDialog(const TextureDescription &t, const TextureS
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
ui->filename->setFont(Formatter::PreferredFont());
ui->fileFormat->setFont(Formatter::PreferredFont());
ui->jpegCompression->setFont(Formatter::PreferredFont());
ui->mipSelect->setFont(Formatter::PreferredFont());
ui->sampleSelect->setFont(Formatter::PreferredFont());
ui->sliceSelect->setFont(Formatter::PreferredFont());
ui->blackPoint->setFont(Formatter::PreferredFont());
ui->whitePoint->setFont(Formatter::PreferredFont());
QObject::connect(&typingTimer, &QTimer::timeout, [this] { SetFiletypeFromFilename(); });
ui->fileFormat->clear();
qrenderdoc/Windows/EventBrowser.cpp
+4
View File
@@ -64,6 +64,10 @@ EventBrowser::EventBrowser(ICaptureContext &ctx, QWidget *parent)
clearBookmarks();
ui->jumpToEID->setFont(Formatter::PreferredFont());
ui->find->setFont(Formatter::PreferredFont());
ui->events->setFont(Formatter::PreferredFont());
ui->events->setColumns(
{tr("Name"), lit("EID"), lit("Duration - replaced in UpdateDurationColumn")});
qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+50
View File
@@ -353,6 +353,56 @@ D3D11PipelineStateViewer::D3D11PipelineStateViewer(ICaptureContext &ctx,
ui->pipeFlow->setStagesEnabled({true, true, true, true, true, true, true, true, true});
ui->iaLayouts->setFont(Formatter::PreferredFont());
ui->iaBuffers->setFont(Formatter::PreferredFont());
ui->csUAVs->setFont(Formatter::PreferredFont());
ui->gsStreamOut->setFont(Formatter::PreferredFont());
ui->groupX->setFont(Formatter::PreferredFont());
ui->groupY->setFont(Formatter::PreferredFont());
ui->groupZ->setFont(Formatter::PreferredFont());
ui->threadX->setFont(Formatter::PreferredFont());
ui->threadY->setFont(Formatter::PreferredFont());
ui->threadZ->setFont(Formatter::PreferredFont());
ui->vsShader->setFont(Formatter::PreferredFont());
ui->vsResources->setFont(Formatter::PreferredFont());
ui->vsSamplers->setFont(Formatter::PreferredFont());
ui->vsCBuffers->setFont(Formatter::PreferredFont());
ui->vsClasses->setFont(Formatter::PreferredFont());
ui->gsShader->setFont(Formatter::PreferredFont());
ui->gsResources->setFont(Formatter::PreferredFont());
ui->gsSamplers->setFont(Formatter::PreferredFont());
ui->gsCBuffers->setFont(Formatter::PreferredFont());
ui->gsClasses->setFont(Formatter::PreferredFont());
ui->hsShader->setFont(Formatter::PreferredFont());
ui->hsResources->setFont(Formatter::PreferredFont());
ui->hsSamplers->setFont(Formatter::PreferredFont());
ui->hsCBuffers->setFont(Formatter::PreferredFont());
ui->hsClasses->setFont(Formatter::PreferredFont());
ui->dsShader->setFont(Formatter::PreferredFont());
ui->dsResources->setFont(Formatter::PreferredFont());
ui->dsSamplers->setFont(Formatter::PreferredFont());
ui->dsCBuffers->setFont(Formatter::PreferredFont());
ui->dsClasses->setFont(Formatter::PreferredFont());
ui->psShader->setFont(Formatter::PreferredFont());
ui->psResources->setFont(Formatter::PreferredFont());
ui->psSamplers->setFont(Formatter::PreferredFont());
ui->psCBuffers->setFont(Formatter::PreferredFont());
ui->psClasses->setFont(Formatter::PreferredFont());
ui->csShader->setFont(Formatter::PreferredFont());
ui->csResources->setFont(Formatter::PreferredFont());
ui->csSamplers->setFont(Formatter::PreferredFont());
ui->csCBuffers->setFont(Formatter::PreferredFont());
ui->csClasses->setFont(Formatter::PreferredFont());
ui->viewports->setFont(Formatter::PreferredFont());
ui->scissors->setFont(Formatter::PreferredFont());
ui->targetOutputs->setFont(Formatter::PreferredFont());
ui->blends->setFont(Formatter::PreferredFont());
// reset everything back to defaults
clearState();
}
qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+44
View File
@@ -392,6 +392,50 @@ D3D12PipelineStateViewer::D3D12PipelineStateViewer(ICaptureContext &ctx,
ui->pipeFlow->setStagesEnabled({true, true, true, true, true, true, true, true, true});
ui->iaLayouts->setFont(Formatter::PreferredFont());
ui->iaBuffers->setFont(Formatter::PreferredFont());
ui->gsStreamOut->setFont(Formatter::PreferredFont());
ui->groupX->setFont(Formatter::PreferredFont());
ui->groupY->setFont(Formatter::PreferredFont());
ui->groupZ->setFont(Formatter::PreferredFont());
ui->threadX->setFont(Formatter::PreferredFont());
ui->threadY->setFont(Formatter::PreferredFont());
ui->threadZ->setFont(Formatter::PreferredFont());
ui->vsShader->setFont(Formatter::PreferredFont());
ui->vsResources->setFont(Formatter::PreferredFont());
ui->vsSamplers->setFont(Formatter::PreferredFont());
ui->vsCBuffers->setFont(Formatter::PreferredFont());
ui->vsUAVs->setFont(Formatter::PreferredFont());
ui->gsShader->setFont(Formatter::PreferredFont());
ui->gsResources->setFont(Formatter::PreferredFont());
ui->gsSamplers->setFont(Formatter::PreferredFont());
ui->gsCBuffers->setFont(Formatter::PreferredFont());
ui->gsUAVs->setFont(Formatter::PreferredFont());
ui->hsShader->setFont(Formatter::PreferredFont());
ui->hsResources->setFont(Formatter::PreferredFont());
ui->hsSamplers->setFont(Formatter::PreferredFont());
ui->hsCBuffers->setFont(Formatter::PreferredFont());
ui->hsUAVs->setFont(Formatter::PreferredFont());
ui->dsShader->setFont(Formatter::PreferredFont());
ui->dsResources->setFont(Formatter::PreferredFont());
ui->dsSamplers->setFont(Formatter::PreferredFont());
ui->dsCBuffers->setFont(Formatter::PreferredFont());
ui->dsUAVs->setFont(Formatter::PreferredFont());
ui->psShader->setFont(Formatter::PreferredFont());
ui->psResources->setFont(Formatter::PreferredFont());
ui->psSamplers->setFont(Formatter::PreferredFont());
ui->psCBuffers->setFont(Formatter::PreferredFont());
ui->psUAVs->setFont(Formatter::PreferredFont());
ui->csShader->setFont(Formatter::PreferredFont());
ui->csResources->setFont(Formatter::PreferredFont());
ui->csSamplers->setFont(Formatter::PreferredFont());
ui->csCBuffers->setFont(Formatter::PreferredFont());
ui->csUAVs->setFont(Formatter::PreferredFont());
ui->viewports->setFont(Formatter::PreferredFont());
ui->scissors->setFont(Formatter::PreferredFont());
ui->targetOutputs->setFont(Formatter::PreferredFont());
ui->blends->setFont(Formatter::PreferredFont());
// reset everything back to defaults
clearState();
}
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+44
View File
@@ -361,6 +361,50 @@ GLPipelineStateViewer::GLPipelineStateViewer(ICaptureContext &ctx, PipelineState
ui->pipeFlow->setStagesEnabled({true, true, true, true, true, true, true, true, true});
ui->viAttrs->setFont(Formatter::PreferredFont());
ui->viBuffers->setFont(Formatter::PreferredFont());
ui->gsFeedback->setFont(Formatter::PreferredFont());
ui->vsShader->setFont(Formatter::PreferredFont());
ui->vsTextures->setFont(Formatter::PreferredFont());
ui->vsSamplers->setFont(Formatter::PreferredFont());
ui->vsUBOs->setFont(Formatter::PreferredFont());
ui->vsSubroutines->setFont(Formatter::PreferredFont());
ui->vsReadWrite->setFont(Formatter::PreferredFont());
ui->gsShader->setFont(Formatter::PreferredFont());
ui->gsTextures->setFont(Formatter::PreferredFont());
ui->gsSamplers->setFont(Formatter::PreferredFont());
ui->gsUBOs->setFont(Formatter::PreferredFont());
ui->gsSubroutines->setFont(Formatter::PreferredFont());
ui->gsReadWrite->setFont(Formatter::PreferredFont());
ui->tcsShader->setFont(Formatter::PreferredFont());
ui->tcsTextures->setFont(Formatter::PreferredFont());
ui->tcsSamplers->setFont(Formatter::PreferredFont());
ui->tcsUBOs->setFont(Formatter::PreferredFont());
ui->tcsSubroutines->setFont(Formatter::PreferredFont());
ui->tcsReadWrite->setFont(Formatter::PreferredFont());
ui->tesShader->setFont(Formatter::PreferredFont());
ui->tesTextures->setFont(Formatter::PreferredFont());
ui->tesSamplers->setFont(Formatter::PreferredFont());
ui->tesUBOs->setFont(Formatter::PreferredFont());
ui->tesSubroutines->setFont(Formatter::PreferredFont());
ui->tesReadWrite->setFont(Formatter::PreferredFont());
ui->fsShader->setFont(Formatter::PreferredFont());
ui->fsTextures->setFont(Formatter::PreferredFont());
ui->fsSamplers->setFont(Formatter::PreferredFont());
ui->fsUBOs->setFont(Formatter::PreferredFont());
ui->fsSubroutines->setFont(Formatter::PreferredFont());
ui->fsReadWrite->setFont(Formatter::PreferredFont());
ui->csShader->setFont(Formatter::PreferredFont());
ui->csTextures->setFont(Formatter::PreferredFont());
ui->csSamplers->setFont(Formatter::PreferredFont());
ui->csUBOs->setFont(Formatter::PreferredFont());
ui->csSubroutines->setFont(Formatter::PreferredFont());
ui->csReadWrite->setFont(Formatter::PreferredFont());
ui->viewports->setFont(Formatter::PreferredFont());
ui->scissors->setFont(Formatter::PreferredFont());
ui->framebuffer->setFont(Formatter::PreferredFont());
ui->blends->setFont(Formatter::PreferredFont());
// reset everything back to defaults
clearState();
}
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+25
View File
@@ -321,6 +321,31 @@ VulkanPipelineStateViewer::VulkanPipelineStateViewer(ICaptureContext &ctx,
ui->pipeFlow->setStagesEnabled({true, true, true, true, true, true, true, true, true});
ui->viAttrs->setFont(Formatter::PreferredFont());
ui->viBuffers->setFont(Formatter::PreferredFont());
ui->vsShader->setFont(Formatter::PreferredFont());
ui->vsResources->setFont(Formatter::PreferredFont());
ui->vsUBOs->setFont(Formatter::PreferredFont());
ui->gsShader->setFont(Formatter::PreferredFont());
ui->gsResources->setFont(Formatter::PreferredFont());
ui->gsUBOs->setFont(Formatter::PreferredFont());
ui->tcsShader->setFont(Formatter::PreferredFont());
ui->tcsResources->setFont(Formatter::PreferredFont());
ui->tcsUBOs->setFont(Formatter::PreferredFont());
ui->tesShader->setFont(Formatter::PreferredFont());
ui->tesResources->setFont(Formatter::PreferredFont());
ui->tesUBOs->setFont(Formatter::PreferredFont());
ui->fsShader->setFont(Formatter::PreferredFont());
ui->fsResources->setFont(Formatter::PreferredFont());
ui->fsUBOs->setFont(Formatter::PreferredFont());
ui->csShader->setFont(Formatter::PreferredFont());
ui->csResources->setFont(Formatter::PreferredFont());
ui->csUBOs->setFont(Formatter::PreferredFont());
ui->viewports->setFont(Formatter::PreferredFont());
ui->scissors->setFont(Formatter::PreferredFont());
ui->framebuffer->setFont(Formatter::PreferredFont());
ui->blends->setFont(Formatter::PreferredFont());
// reset everything back to defaults
clearState();
}
qrenderdoc/Windows/PixelHistoryView.cpp
+2
View File
@@ -559,6 +559,8 @@ PixelHistoryView::PixelHistoryView(ICaptureContext &ctx, ResourceId id, QPoint p
{
ui->setupUi(this);
ui->events->setFont(Formatter::PreferredFont());
m_Pixel = point;
m_Display = display;
qrenderdoc/Windows/ShaderViewer.cpp
+6
View File
@@ -60,6 +60,12 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
{
ui->setupUi(this);
ui->constants->setFont(Formatter::PreferredFont());
ui->variables->setFont(Formatter::PreferredFont());
ui->watch->setFont(Formatter::PreferredFont());
ui->inputSig->setFont(Formatter::PreferredFont());
ui->outputSig->setFont(Formatter::PreferredFont());
// we create this up front so its state stays persistent as much as possible.
m_FindReplace = new FindReplace(this);
qrenderdoc/Windows/TextureViewer.cpp
+10
View File
@@ -480,6 +480,16 @@ TextureViewer::TextureViewer(ICaptureContext &ctx, QWidget *parent)
{
ui->setupUi(this);
ui->textureList->setFont(Formatter::PreferredFont());
ui->textureListFilter->setFont(Formatter::PreferredFont());
ui->rangeBlack->setFont(Formatter::PreferredFont());
ui->rangeWhite->setFont(Formatter::PreferredFont());
ui->hdrMul->setFont(Formatter::PreferredFont());
ui->channels->setFont(Formatter::PreferredFont());
ui->mipLevel->setFont(Formatter::PreferredFont());
ui->sliceFace->setFont(Formatter::PreferredFont());
ui->zoomOption->setFont(Formatter::PreferredFont());
m_Ctx.AddLogViewer(this);
Reset();