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

Add a global font scale option in settings window

Browse Source 
* This lets the user override the default application font.
* Unfortunately Qt seems to behave inconsistently with font scaling from the
  system, so we take the font size initially from QApplication::font() (which
  doesn't always pick up the font size) and scale from there. While this might
  cause some font scaling to be lost it does mean at least we have a consistent
  scale, as otherwise you get some text scaling and others not.
This commit is contained in:
baldurk
2020-02-12 12:37:09 +00:00
parent ce96d120a4
commit 5e6ec417c1
9 changed files with 332 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/window/settings_window.rst
+16 -8
View File
@@ -20,6 +20,22 @@ This allows you to choose what theme to use in RenderDoc. By default when first
The theme won't fully apply until the next restart, although most elements will update immediately to give you a preview.
---------------
| :guilabel:`Global font scale` Default: ``100%``
This option will apply a global font scale to all fonts in the UI. This will only apply to text elements, and other UI elements will take their scale from the system's DPI scaling configuration.
Changing this option will need the UI to be restarted before it fully takes effect on all UI elements.
---------------
| :guilabel:`Prefer monospaced fonts in UI` Default: ``Disabled``
This option will use a monospaced font for every place in the UI where any data or output is displayed.
Changing this option will need the UI to be restarted before it fully takes effect on all UI elements.
---------------
| :guilabel:`Minimum decimal places on float values` Default: ``2``
@@ -116,14 +132,6 @@ Every couple of days RenderDoc will send a single web request to a secure server
If you would prefer RenderDoc does not ever contact an external server, disable this checkbox. If you do this it's recommended that you manually check for updates as new versions will be made available regularly with bugfixes.
---------------
| :guilabel:`Prefer monospaced fonts in UI` Default: ``Disabled``
This option will use a monospaced font for every place in the UI where any data or output is displayed.
Changing this option will need the UI to be restarted before it takes effect.
---------------
| :guilabel:`Always replay captures locally` Default: ``Disabled``
qrenderdoc/Code/Interface/PersistantConfig.cpp
+4
View File
@@ -193,6 +193,10 @@ void PersistantConfig::applyValues(const QVariantMap &values)
RENAMED_SETTING(QVariantList, RecentLogFiles, RecentCaptureFiles);
RENAMED_SETTING(QDateTime, DegradedLog_LastUpdate, DegradedCapture_LastUpdate);
RENAMED_SETTING(QVariantList, SPIRVDisassemblers, ShaderProcessors);
// apply reasonable bounds to font scale to avoid invalid values
// 25% - 400%
Font_GlobalScale = qBound(0.25f, Font_GlobalScale, 4.0f);
}
static QMutex RemoteHostLock;
qrenderdoc/Code/Interface/PersistantConfig.h
+2
View File
@@ -332,6 +332,8 @@ DECLARE_REFLECTION_STRUCT(BugReport);
\
CONFIG_SETTING_VAL(public, int, int, Formatter_PosExp, 7) \
\
CONFIG_SETTING_VAL(public, float, float, Font_GlobalScale, 1.0f) \
\
CONFIG_SETTING_VAL(public, bool, bool, Font_PreferMonospaced, false) \
\
CONFIG_SETTING_VAL(public, QString, rdcstr, Android_SDKPath, "") \
qrenderdoc/Code/QRDUtils.cpp
+11
View File
@@ -1806,6 +1806,8 @@ 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;
float Formatter::m_FontBaseSize = 10.0f; // this should always be overridden below, but just in
// case let's pick a sensible value
QColor Formatter::m_DarkChecker, Formatter::m_LightChecker;
void Formatter::setParams(const PersistantConfig &config)
@@ -1819,10 +1821,19 @@ void Formatter::setParams(const PersistantConfig &config)
m_expPosValue = qPow(10.0, config.Formatter_PosExp);
if(!m_Font)
{
m_Font = new QFont();
m_FontBaseSize = QApplication::font().pointSizeF();
}
*m_Font =
config.Font_PreferMonospaced ? QFontDatabase::systemFont(QFontDatabase::FixedFont) : QFont();
m_Font->setPointSizeF(m_FontBaseSize * config.Font_GlobalScale);
QFont f = QApplication::font();
f.setPointSizeF(m_FontBaseSize * config.Font_GlobalScale);
QApplication::setFont(f);
Formatter::setPalette(QApplication::palette());
}
qrenderdoc/Code/QRDUtils.h
+1
View File
@@ -249,6 +249,7 @@ 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 QColor m_DarkChecker, m_LightChecker;
};
qrenderdoc/Widgets/PipelineFlowChart.cpp
+5 -1
View File
@@ -184,7 +184,11 @@ void PipelineFlowChart::paintEvent(QPaintEvent *e)
QPainter p(this);
p.setFont(Formatter::PreferredFont());
QFont f = Formatter::PreferredFont();
f.setPointSizeF(1.5f * f.pointSizeF());
p.setFont(f);
p.fillRect(rect(), Qt::transparent);
qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
+44 -2
View File
@@ -39,6 +39,8 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
{
ui->setupUi(this);
m_Init = true;
m_ReplayOptions = new ReplayOptionsSelector(m_Ctx, false, this);
ui->replayOptionsLayout->insertWidget(0, m_ReplayOptions);
@@ -54,6 +56,21 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
for(int i = 0; i < StyleData::numAvailable; i++)
ui->UIStyle->addItem(StyleData::availStyles[i].styleName);
ui->Font_GlobalScale->addItems({lit("50%"), lit("75%"), lit("100%"), lit("125%"), lit("150%"),
lit("175%"), lit("200%"), lit("250%"), lit("300%"), lit("400%")});
ui->Font_GlobalScale->setCurrentText(
QString::number(ceil(m_Ctx.Config().Font_GlobalScale * 100)) + lit("%"));
for(int i = 0; i < ui->Font_GlobalScale->count(); i++)
{
if(ui->Font_GlobalScale->currentText() == ui->Font_GlobalScale->itemText(i))
{
ui->Font_GlobalScale->setCurrentIndex(i);
break;
}
}
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
ui->tabWidget->tabBar()->setVisible(false);
@@ -61,8 +78,6 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
for(int i = 0; i < ui->tabWidget->count(); i++)
ui->pages->addItem(ui->tabWidget->tabText(i));
m_Init = true;
for(int i = 0; i < (int)TimeUnit::Count; i++)
{
ui->EventBrowser_TimeUnit->addItem(UnitSuffix((TimeUnit)i));
@@ -183,6 +198,8 @@ SettingsDialog::SettingsDialog(ICaptureContext &ctx, QWidget *parent)
m_Init = false;
QObject::connect(ui->Font_GlobalScale->lineEdit(), &QLineEdit::returnPressed, this,
&SettingsDialog::Font_GlobalScale_returnPressed);
QObject::connect(ui->shaderTools->verticalHeader(), &QHeaderView::sectionMoved, this,
&SettingsDialog::shaderTools_rowMoved);
QObject::connect(ui->Formatter_MinFigures, OverloadedSlot<int>::of(&QSpinBox::valueChanged), this,
@@ -240,6 +257,31 @@ void SettingsDialog::on_okButton_accepted()
accept();
}
void SettingsDialog::on_Font_GlobalScale_currentIndexChanged(int index)
{
Font_GlobalScale_returnPressed();
}
void SettingsDialog::Font_GlobalScale_returnPressed()
{
if(m_Init)
return;
QString scaleText = ui->Font_GlobalScale->currentText().replace(QLatin1Char('%'), QLatin1Char(' '));
bool ok = false;
int scale = scaleText.toInt(&ok);
if(!ok)
scale = 100;
m_Ctx.Config().Font_GlobalScale = (float)(scale) / 100.0f;
m_Ctx.Config().SetupFormatting();
m_Ctx.Config().Save();
}
// general
void SettingsDialog::formatter_valueChanged(int val)
{
qrenderdoc/Windows/Dialogs/SettingsDialog.h
+2
View File
@@ -56,6 +56,8 @@ private slots:
void on_okButton_accepted();
// general
void on_Font_GlobalScale_currentIndexChanged(int index);
void Font_GlobalScale_returnPressed();
void on_UIStyle_currentIndexChanged(int index);
void on_tempDirectory_textEdited(const QString &temp);
void on_saveDirectory_textEdited(const QString &save);
qrenderdoc/Windows/Dialogs/SettingsDialog.ui
+247 -227
View File
@@ -101,167 +101,15 @@
<string>General</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="6" column="0">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Changes the directory where capture files are saved after being created, until saved manually or deleted.
Defaults to %TEMP%.</string>
</property>
<property name="text">
<string>Directory for temporary capture files</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="Formatter_NegExp">
<property name="toolTip">
<string>Any numbers smaller than this exponent will be displayed in scientific notation.
E.g. a value of 3 means 0.005 / 10 = 5E-4</string>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="14" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="0">
<widget class="QLineEdit" name="tempDirectory">
<property name="toolTip">
<string>Changes the directory where capture files are saved after being created, until saved manually or deleted.
Defaults to %TEMP%.</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QPushButton" name="browseTempCaptureDirectory">
<property name="toolTip">
<string>Changes the directory where capture files are saved after being created, until saved manually or deleted.
Defaults to %TEMP%.</string>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QPushButton" name="browseSaveCaptureDirectory">
<item row="10" column="0">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>Changes the default directory for the save dialog when saving capture files.
Defaults to blank, which follows system default behaviour.</string>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QCheckBox" name="AllowGlobalHook">
<property name="toolTip">
<string>Enables functionality on the capture application window that will insert RenderDoc automatically
into all new processes created - then inject into the target (matching) executable.
Useful for capturing programs indirectly that can't easily be launched directly by RenderDoc
Since this is a global system hook it must be used carefully and only when necessary!</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QCheckBox" name="CheckUpdate_AllowChecks">
<property name="toolTip">
<string>Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QCheckBox" name="Font_PreferMonospaced">
<property name="toolTip">
<string>Wherever possible a monospaced font will be used instead of the default font</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="Formatter_MaxFigures">
<property name="toolTip">
<string>No more decimal places than this will be displayed on floats.
e.g. a value of 5 means 0.123456789 will display as 0.12345 and 123.123456789 will display as 123.12345</string>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLineEdit" name="saveDirectory">
<property name="toolTip">
<string>Changes the default directory for the save dialog when saving capture files.
Defaults to blank, which follows system default behaviour.</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="Formatter_PosExp">
<property name="toolTip">
<string>Any numbers larger than this exponent will be displayed in scientific notation.
e.g. 1000 * 10 = 1e4</string>
</property>
<property name="value">
<number>7</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_10">
<property name="toolTip">
<string>If a capture is marked as being created on a significantly different system (different OS or platform)
as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context.
This option overrides that and will always replay locally if the local context is selected.</string>
</property>
<property name="text">
<string>Always replay captures locally, never prompt about it</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="AlwaysReplayLocally">
<property name="toolTip">
<string>If a capture is marked as being created on a significantly different system (different OS or platform)
as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context.
This option overrides that and will always replay locally if the local context is selected.</string>
</property>
<property name="text">
<string/>
<string>Default save directory for captures</string>
</property>
</widget>
</item>
@@ -278,76 +126,7 @@ This option overrides that and will always replay locally if the local context i
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="UIStyle_label">
<property name="text">
<string>Visual theme of the UI</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_4">
<property name="toolTip">
<string>Any numbers larger than this exponent will be displayed in scientific notation.
e.g. 1000 * 10 = 1e4</string>
</property>
<property name="text">
<string>Positive exponential cutoff value</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_9">
<property name="toolTip">
<string>Wherever possible a monospaced font will be used instead of the default font</string>
</property>
<property name="text">
<string>Prefer monospaced fonts in UI (restart required)</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="Formatter_MinFigures">
<property name="toolTip">
<string>Decimals will display at least this many digits.
e.g. a value of 2 means 0 will display as 0.00, 0.5 as 0.50</string>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>Changes the default directory for the save dialog when saving capture files.
Defaults to blank, which follows system default behaviour.</string>
</property>
<property name="text">
<string>Default save directory for captures</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Any numbers smaller than this exponent will be displayed in scientific notation.
E.g. a value of 3 means 0.005 / 10 = 5E-4</string>
</property>
<property name="text">
<string>Negative exponential cutoff value</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="toolTip">
<string>At least this many decimal places will be displayed on floats.
@@ -358,7 +137,39 @@ e.g. a value of 2 means 0 will display as 0.00, 0.5 as 0.50. A value of 5 would
</property>
</widget>
</item>
<item row="10" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="toolTip">
<string>Any numbers smaller than this exponent will be displayed in scientific notation.
E.g. a value of 3 means 0.005 / 10 = 5E-4</string>
</property>
<property name="text">
<string>Negative exponential cutoff value</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="UIStyle_label">
<property name="text">
<string>Visual theme of the UI</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QSpinBox" name="Formatter_PosExp">
<property name="toolTip">
<string>Any numbers larger than this exponent will be displayed in scientific notation.
e.g. 1000 * 10 = 1e4</string>
</property>
<property name="value">
<number>7</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="globalHookLabel">
<property name="toolTip">
<string>Enables functionality on the capture application window that will insert RenderDoc automatically
@@ -373,7 +184,94 @@ Since this is a global system hook it must be used carefully and only when neces
</property>
</widget>
</item>
<item row="3" column="0">
<item row="14" column="0">
<widget class="QLabel" name="label_10">
<property name="toolTip">
<string>If a capture is marked as being created on a significantly different system (different OS or platform)
as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context.
This option overrides that and will always replay locally if the local context is selected.</string>
</property>
<property name="text">
<string>Always replay captures locally, never prompt about it</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QPushButton" name="browseSaveCaptureDirectory">
<property name="toolTip">
<string>Changes the default directory for the save dialog when saving capture files.
Defaults to blank, which follows system default behaviour.</string>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_5">
<property name="toolTip">
<string>Changes the directory where capture files are saved after being created, until saved manually or deleted.
Defaults to %TEMP%.</string>
</property>
<property name="text">
<string>Directory for temporary capture files</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLineEdit" name="tempDirectory">
<property name="toolTip">
<string>Changes the directory where capture files are saved after being created, until saved manually or deleted.
Defaults to %TEMP%.</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="Formatter_MaxFigures">
<property name="toolTip">
<string>No more decimal places than this will be displayed on floats.
e.g. a value of 5 means 0.123456789 will display as 0.12345 and 123.123456789 will display as 123.12345</string>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="Formatter_MinFigures">
<property name="toolTip">
<string>Decimals will display at least this many digits.
e.g. a value of 2 means 0 will display as 0.00, 0.5 as 0.50</string>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="CheckUpdate_AllowChecks">
<property name="toolTip">
<string>Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLineEdit" name="saveDirectory">
<property name="toolTip">
<string>Changes the default directory for the save dialog when saving capture files.
Defaults to blank, which follows system default behaviour.</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_2">
<property name="toolTip">
<string>No more decimal places than this will be displayed on floats.
@@ -384,7 +282,63 @@ e.g. a value of 5 means 0.123456789 will display as 0.12345</string>
</property>
</widget>
</item>
<item row="11" column="0">
<item row="9" column="1">
<widget class="QPushButton" name="browseTempCaptureDirectory">
<property name="toolTip">
<string>Changes the directory where capture files are saved after being created, until saved manually or deleted.
Defaults to %TEMP%.</string>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="14" column="1">
<widget class="QCheckBox" name="AlwaysReplayLocally">
<property name="toolTip">
<string>If a capture is marked as being created on a significantly different system (different OS or platform)
as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context.
This option overrides that and will always replay locally if the local context is selected.</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="16" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QSpinBox" name="Formatter_NegExp">
<property name="toolTip">
<string>Any numbers smaller than this exponent will be displayed in scientific notation.
E.g. a value of 3 means 0.005 / 10 = 5E-4</string>
</property>
<property name="value">
<number>5</number>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_8">
<property name="toolTip">
<string>Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions.</string>
@@ -394,6 +348,72 @@ e.g. a value of 5 means 0.123456789 will display as 0.12345</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QCheckBox" name="AllowGlobalHook">
<property name="toolTip">
<string>Enables functionality on the capture application window that will insert RenderDoc automatically
into all new processes created - then inject into the target (matching) executable.
Useful for capturing programs indirectly that can't easily be launched directly by RenderDoc
Since this is a global system hook it must be used carefully and only when necessary!</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_4">
<property name="toolTip">
<string>Any numbers larger than this exponent will be displayed in scientific notation.
e.g. 1000 * 10 = 1e4</string>
</property>
<property name="text">
<string>Positive exponential cutoff value</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="Font_PreferMonospaced">
<property name="toolTip">
<string>Wherever possible a monospaced font will be used instead of the default font</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="toolTip">
<string>Wherever possible a monospaced font will be used instead of the default font</string>
</property>
<property name="text">
<string>Prefer monospaced fonts in UI (restart required)</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_27">
<property name="toolTip">
<string>A global scale for all fonts in the program. This will only scale text, icons and other UI elements will be scaled according to DPI settings as normal.</string>
</property>
<property name="text">
<string>Global font scale (restart required)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="Font_GlobalScale">
<property name="toolTip">
<string>A global scale for all fonts in the program. This will only scale text, icons and other UI elements will be scaled according to DPI settings as normal.</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>