Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set tab stop distance with tabStopDistance in Gui #718

Merged
merged 1 commit into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Gui/EditScriptDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,11 @@ EditScriptDialog::create(const QString& initialScript,
_imp->resultEdit->setFont(font);
}
QFontMetrics fm = _imp->expressionEdit->fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
_imp->expressionEdit->setTabStopDistance( 4 * fm.horizontalAdvance( QLatin1Char(' ') ) );
#else
_imp->expressionEdit->setTabStopWidth( 4 * fm.width( QLatin1Char(' ') ) );
#endif
} // EditScriptDialog::create

void
Expand Down
4 changes: 4 additions & 0 deletions Gui/KnobGuiString.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ AnimatingTextEdit::AnimatingTextEdit(const KnobGuiPtr& knob,
, dirty(false)
, _dnd( KnobWidgetDnD::create(knob, dimension, this) )
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
setTabStopDistance(20);
#else
setTabStopWidth(20); // a tab width of 20 is more reasonable than 80 for programming languages (e.g. Shadertoy)
#endif
}

AnimatingTextEdit::~AnimatingTextEdit()
Expand Down
5 changes: 5 additions & 0 deletions Gui/ScriptEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,13 @@ ScriptEditor::ScriptEditor(Gui* gui)
_imp->inputEdit = new InputScriptTextEdit(gui, this);
QObject::connect( _imp->inputEdit, SIGNAL(textChanged()), this, SLOT(onInputScriptTextChanged()) );
QFontMetrics fm = _imp->inputEdit->fontMetrics();
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
_imp->inputEdit->setTabStopDistance(fm.horizontalAdvance( QLatin1Char(' ') ) * 4);
_imp->outputEdit->setTabStopDistance(fm.horizontalAdvance( QLatin1Char(' ') ) * 4);
#else
_imp->inputEdit->setTabStopWidth(fm.width( QLatin1Char(' ') ) * 4);
_imp->outputEdit->setTabStopWidth(fm.width( QLatin1Char(' ') ) * 4);
#endif

_imp->mainLayout->addWidget(_imp->buttonsContainer);
splitter->addWidget(_imp->outputEdit);
Expand Down