lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 08:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove device scaling factor from margins in the UI

Browse Source 
Makes ShaderViewer, Capture Comments and Python Shell margins look correct for non-unit system scaling
This commit is contained in:
Jake Turner
2024-06-12 16:37:02 +01:00
parent a711d219d1
commit b7b5ec0c14
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/CommentView.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ CommentView::CommentView(ICaptureContext &ctx, QWidget *parent)
m_commentsEditor->setWrapMode(SC_WRAP_WORD);
m_commentsEditor->setWrapVisualFlags(SC_WRAPVISUALFLAG_MARGIN);
m_commentsEditor->setMarginWidthN(0, sptr_t(30.0 * devicePixelRatioF()));
m_commentsEditor->setMarginWidthN(0, 30.0);
ConfigureSyntax(m_commentsEditor, SCLEX_NULL);
qrenderdoc/Windows/PythonShell.cpp
+4 -4
View File
@@ -914,10 +914,10 @@ PythonShell::PythonShell(ICaptureContext &ctx, QWidget *parent)
scriptEditor->styleSetFont(STYLE_DEFAULT, Formatter::FixedFont().family().toUtf8().data());
scriptEditor->setMarginLeft(4.0 * devicePixelRatioF());
scriptEditor->setMarginWidthN(0, 32.0 * devicePixelRatioF());
scriptEditor->setMarginWidthN(1, 0);
scriptEditor->setMarginWidthN(2, 16.0 * devicePixelRatioF());
scriptEditor->setMarginLeft(4.0);
scriptEditor->setMarginWidthN(0, 32.0);
scriptEditor->setMarginWidthN(1, 0.0);
scriptEditor->setMarginWidthN(2, 16.0);
scriptEditor->setObjectName(lit("scriptEditor"));
scriptEditor->markerSetBack(CURRENT_MARKER, SCINTILLA_COLOUR(240, 128, 128));
qrenderdoc/Windows/ShaderViewer.cpp
+4 -4
View File
@@ -1477,9 +1477,9 @@ ScintillaEdit *ShaderViewer::MakeEditor(const QString &name, const QString &text
{
ScintillaEdit *ret = new ScintillaEdit(this);
ret->setMarginLeft(4.0 * devicePixelRatioF());
ret->setMarginWidthN(1, 20.0 * devicePixelRatioF());
ret->setMarginWidthN(2, 16.0 * devicePixelRatioF());
ret->setMarginLeft(4.0);
ret->setMarginWidthN(1, 20.0);
ret->setMarginWidthN(2, 16.0);
ret->setObjectName(name);
ret->styleSetFont(STYLE_DEFAULT, Formatter::FixedFont().family().toUtf8().data());
@@ -1536,7 +1536,7 @@ void ShaderViewer::SetTextAndUpdateMargin0(ScintillaEdit *sc, const QString &tex
sptr_t width = sc->textWidth(SC_MARGIN_RTEXT, QString::number(numLines).toUtf8().data());
sc->setMarginWidthN(0, int(width * devicePixelRatioF()));
sc->setMarginWidthN(0, int(width));
}
void ShaderViewer::readonly_keyPressed(QKeyEvent *event)