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

Calculate column widths with devicePixelRatio

Browse Source
This commit is contained in:
baldurk
2018-01-16 12:53:56 +00:00
parent 5e819a6e23
commit 34fc993b59
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/PythonShell.cpp
+3 -3
View File
@@ -462,10 +462,10 @@ PythonShell::PythonShell(ICaptureContext &ctx, QWidget *parent)
scriptEditor->styleSetFont(
STYLE_DEFAULT, QFontDatabase::systemFont(QFontDatabase::FixedFont).family().toUtf8().data());
scriptEditor->setMarginLeft(4);
scriptEditor->setMarginWidthN(0, 32);
scriptEditor->setMarginLeft(4.0 * devicePixelRatioF());
scriptEditor->setMarginWidthN(0, 32.0 * devicePixelRatioF());
scriptEditor->setMarginWidthN(1, 0);
scriptEditor->setMarginWidthN(2, 16);
scriptEditor->setMarginWidthN(2, 16.0 * devicePixelRatioF());
scriptEditor->setObjectName(lit("scriptEditor"));
scriptEditor->markerSetBack(CURRENT_MARKER, SCINTILLA_COLOUR(240, 128, 128));
qrenderdoc/Windows/ShaderViewer.cpp
+5 -3
View File
@@ -446,7 +446,7 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR
ui->docking->setToolWindowProperties(
ui->constants, ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow);
m_DisassemblyView->setMarginWidthN(1, 20);
m_DisassemblyView->setMarginWidthN(1, 20.0 * devicePixelRatioF());
// display current line in margin 2, distinct from breakpoint in margin 1
sptr_t markMask = (1 << CURRENT_MARKER) | (1 << FINISHED_MARKER);
@@ -678,10 +678,12 @@ ScintillaEdit *ShaderViewer::MakeEditor(const QString &name, const QString &text
if(numlines > 10000)
margin0width += 6;
ret->setMarginLeft(4);
margin0width = int(margin0width * devicePixelRatioF());
ret->setMarginLeft(4.0 * devicePixelRatioF());
ret->setMarginWidthN(0, margin0width);
ret->setMarginWidthN(1, 0);
ret->setMarginWidthN(2, 16);
ret->setMarginWidthN(2, 16.0 * devicePixelRatioF());
ret->setObjectName(name);
ret->styleSetFont(STYLE_DEFAULT,