Skip to content

Fix Font Style on Windows and macOS #1799

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.

Sign up for GitHub

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

Merged
ddennedy merged 4 commits into from
Mar 17, 2026
+61 −10
Merged

Fix Font Style on Windows and macOS #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d2d880
Fix Font Style on Windows and macOS
ddennedy Mar 16, 2026
ddb9a78
Fix comments
ddennedy Mar 16, 2026
38fc11d
Apply suggestions from code review
ddennedy Mar 16, 2026
3d33bdf
Set MLT style for all non-standard cases
ddennedy Mar 16, 2026
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
5 changes: 4 additions & 1 deletion src/qml/filters/richtext/vui.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ Shotcut.VuiBase {
icon.source: 'qrc:///icons/oxygen/32x32/actions/font.png'
onTriggered: {
fontDialog.selectedFont.family = document.fontFamily;
fontDialog.selectedFont.styleName = document.fontStyleName;
fontDialog.selectedFont.pointSize = document.fontSize;
fontDialog.selectedFont.underline = document.underline;
fontDialog.selectedFont.strikeout = document.strikeout;
Expand Down Expand Up @@ -672,7 +673,8 @@ Shotcut.VuiBase {
icon.source: 'qrc:///icons/oxygen/32x32/actions/font.png'
onTriggered: {
fontDialog.selectedFont.family = document.fontFamily;
fontDialog.seelctedFont.pointSize = document.fontSize;
fontDialog.selectedFont.styleName = document.fontStyleName;
fontDialog.selectedFont.pointSize = document.fontSize;
fontDialog.selectedFont.underline = document.underline;
fontDialog.selectedFont.strikeout = document.strikeout;
fontDialog.open();
Expand Down Expand Up @@ -714,6 +716,7 @@ Shotcut.VuiBase {

onAccepted: {
document.fontFamily = selectedFont.family;
document.fontStyleName = selectedFont.styleName;
document.fontSize = selectedFont.pointSize;
document.underline = selectedFont.underline;
document.strikeout = selectedFont.strikeout;
Expand Down
38 changes: 29 additions & 9 deletions src/qml/modules/Shotcut/Controls/TextFilterUi.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,25 @@ GridLayout {

function refreshFontButton() {
var s = filter.get('family');
if (filter.getDouble('weight') > Font.Medium)
s += ' ' + qsTr('Bold');
if (filter.get('style') === 'italic')
s += ' ' + qsTr('Italic');
const style = filter.get('style');
if (style && style !== 'italic' && style !== 'normal') {
s += ' ' + style;
} else {
if (filter.getDouble('weight') > Font.Medium)
s += ' ' + qsTr('Bold');
if (style === 'italic')
s += ' ' + qsTr('Italic');
}
if (parseInt(filter.get(useFontSizeProperty)))
s += ' ' + getPointSize();
fontButton.text = s;
}

function setControls() {
fontButton.text = filter.get('family');
const mltFamily = filter.get('family') || "";
const mltStyle = filter.get('style') || "";
const fontStyleName = (mltStyle && mltStyle !== 'italic' && mltStyle !== 'normal') ? mltStyle : "";
fontButton.text = mltFamily;
outlineSpinner.value = filter.getDouble('outline');
padSpinner.value = filter.getDouble('pad');
var align = filter.get(halignProperty);
Expand All @@ -102,9 +110,10 @@ GridLayout {
else if (align === 'bottom')
bottomRadioButton.checked = true;
fontDialog.selectedFont = Qt.font({
"family": filter.get('family'),
"family": mltFamily,
"styleName": fontStyleName,
"pointSize": getPointSize(),
"italic": filter.get('style') === 'italic',
"italic": mltStyle === 'italic',
"weight": filter.getDouble('weight'),
"underline": filter.getDouble('underline'),
"strikeout": filter.getDouble('strikethrough')
Expand Down Expand Up @@ -244,11 +253,18 @@ GridLayout {
id: fontDialog

property string fontFamily: ''
property string fontStyle: ''
readonly property var stdStyles: ['', 'regular', 'bold', 'italic', 'bold italic', 'oblique', 'bold oblique']

onSelectedFontChanged: {
const styleName = selectedFont.styleName;
if (styleName && !stdStyles.includes(styleName.toLowerCase())) {
filter.set('style', styleName);
} else {
filter.set('style', selectedFont.italic ? 'italic' : 'normal');
}
filter.set('family', selectedFont.family);
filter.set('weight', selectedFont.weight);
filter.set('style', selectedFont.italic ? 'italic' : 'normal');
filter.set('underline', selectedFont.underline);
filter.set('strikethrough', selectedFont.strikeout);
if (parseInt(filter.get(useFontSizeProperty))) {
Expand All @@ -257,9 +273,13 @@ GridLayout {
}
refreshFontButton();
}
onAccepted: fontFamily = selectedFont.family
onAccepted: {
fontFamily = selectedFont.family;
fontStyle = filter.get('style');
}
onRejected: {
filter.set('family', fontFamily);
filter.set('style', fontStyle);
refreshFontButton();
}
}
Expand Down
23 changes: 23 additions & 0 deletions src/qmltypes/qmlrichtext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ void QmlRichText::setCursorPosition(int position)
void QmlRichText::reset()
{
emit fontFamilyChanged();
emit fontStyleNameChanged();
emit alignmentChanged();
emit boldChanged();
emit italicChanged();
Expand Down Expand Up @@ -423,3 +424,25 @@ void QmlRichText::setFontFamily(const QString &arg)
mergeFormatOnWordOrSelection(format);
emit fontFamilyChanged();
}

QString QmlRichText::fontStyleName() const
{
QTextCursor cursor = textCursor();
if (cursor.isNull())
return QString();
QTextCharFormat format = cursor.charFormat();
return format.font().styleName();
}

void QmlRichText::setFontStyleName(const QString &arg)
{
QTextCursor cursor = textCursor();
if (cursor.isNull())
return;
QTextCharFormat format;
QFont font;
font.setStyleName(arg);
format.setFont(font, QTextCharFormat::FontPropertiesSpecifiedOnly);
mergeFormatOnWordOrSelection(format);
emit fontStyleNameChanged();
}
5 changes: 5 additions & 0 deletions src/qmltypes/qmlrichtext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ class QmlRichText : public QObject
Q_PROPERTY(int selectionEnd READ selectionEnd WRITE setSelectionEnd NOTIFY selectionEndChanged)
Q_PROPERTY(QColor textColor READ textColor WRITE setTextColor NOTIFY textColorChanged)
Q_PROPERTY(QString fontFamily READ fontFamily WRITE setFontFamily NOTIFY fontFamilyChanged)
Q_PROPERTY(
QString fontStyleName READ fontStyleName WRITE setFontStyleName NOTIFY fontStyleNameChanged)
Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
Q_PROPERTY(bool bold READ bold WRITE setBold NOTIFY boldChanged)
Q_PROPERTY(bool italic READ italic WRITE setItalic NOTIFY italicChanged)
Expand All @@ -78,6 +80,7 @@ class QmlRichText : public QObject
int selectionStart() const { return m_selectionStart; }
int selectionEnd() const { return m_selectionEnd; }
QString fontFamily() const;
QString fontStyleName() const;
QColor textColor() const;
Qt::Alignment alignment() const;
void setAlignment(Qt::Alignment a);
Expand All @@ -98,6 +101,7 @@ public slots:
void setFontSize(int arg);
void setTextColor(const QColor &arg);
void setFontFamily(const QString &arg);
void setFontStyleName(const QString &arg);
void setFileUrl(const QUrl &arg);
void setText(const QString &arg);
void saveAs(const QUrl &arg, QString fileType = QString());
Expand All @@ -113,6 +117,7 @@ public slots:
void selectionStartChanged();
void selectionEndChanged();
void fontFamilyChanged();
void fontStyleNameChanged();
void textColorChanged();
void alignmentChanged();
void boldChanged();
Expand Down
Loading