oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewertexteditor: reset style on family change

Browse Source
This commit is contained in:
itsmattkc
2022-03-30 15:48:11 -07:00
parent f23d838068
commit 1f70c8f18d
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewertexteditor.cpp
+25 -8
View File
@@ -213,11 +213,16 @@ void ViewerTextEditor::FormatChanged(const QTextCharFormat &f)
void ViewerTextEditor::SetFamily(const QString &s)
{
ViewerTextEditorToolBar *toolbar = static_cast<ViewerTextEditorToolBar *>(sender());
QTextCharFormat f;
f.setFontFamily(s);
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
f.setFontFamilies({s});
#endif
ApplyStyle(&f, s, toolbar->GetFontStyleName());
MergeCharFormat(f);
}
@@ -227,12 +232,7 @@ void ViewerTextEditor::SetStyle(const QString &s)
QTextCharFormat f;
// NOTE: Windows appears to require setting weight and italic manually instead of just the style name
QFontDatabase fd;
f.setFontWeight(fd.weight(toolbar->GetFontFamily(), s));
f.setFontItalic(fd.italic(toolbar->GetFontFamily(), s));
f.setFontStyleName(s);
ApplyStyle(&f, toolbar->GetFontFamily(), s);
MergeCharFormat(f);
}
@@ -274,6 +274,17 @@ void ViewerTextEditor::MergeCharFormat(const QTextCharFormat &fmt)
block_update_toolbar_signal_ = false;
}
void ViewerTextEditor::ApplyStyle(QTextCharFormat *format, const QString &family, const QString &style)
{
// NOTE: Windows appears to require setting weight and italic manually, while macOS and Linux are
// perfectly fine with just the style name
QFontDatabase fd;
format->setFontWeight(fd.weight(family, style));
format->setFontItalic(fd.italic(family, style));
format->setFontStyleName(style);
}
void ViewerTextEditor::SetLineHeight(qreal i)
{
QTextBlockFormat f = this->textCursor().blockFormat();
@@ -322,8 +333,7 @@ ViewerTextEditorToolBar::ViewerTextEditorToolBar(QWidget *parent) :
int advanced_slider_width = QtUtils::QFontMetricsWidth(fontMetrics(), QStringLiteral("9999.9%"));
font_combo_ = new QFontComboBox();
connect(font_combo_, &QFontComboBox::currentTextChanged, this, &ViewerTextEditorToolBar::FamilyChanged);
connect(font_combo_, &QFontComboBox::currentTextChanged, this, &ViewerTextEditorToolBar::UpdateFontStyleList);
connect(font_combo_, &QFontComboBox::currentTextChanged, this, &ViewerTextEditorToolBar::UpdateFontStyleListAndEmitFamilyChanged);
basic_layout->addWidget(font_combo_);
font_sz_slider_ = new FloatSlider();
@@ -483,6 +493,13 @@ void ViewerTextEditorToolBar::UpdateFontStyleList(const QString &family)
style_combo_->blockSignals(false);
}
void ViewerTextEditorToolBar::UpdateFontStyleListAndEmitFamilyChanged(const QString &family)
{
// Ensures correct ordering of commands
UpdateFontStyleList(family);
emit FamilyChanged(family);
}
void ViewerTextEditorToolBar::mousePressEvent(QMouseEvent *event)
{
QWidget::mousePressEvent(event);