Skip to content

Commit 3226cb9

Browse files
committed
Fix param defaults in New > Text > Typewriter
1 parent 7efc356 commit 3226cb9

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

src/widgets/textproducerwidget.cpp

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Mlt::Filter *TextProducerWidget::createFilter(Mlt::Profile &profile, Mlt::Produc
217217
filter->set("typewriter.macro_type", 1);
218218
filter->set("typewriter.cursor", 1);
219219
filter->set("typewriter.cursor_blink_rate", 25);
220-
filter->set("typewriter.cursor_char", '|');
220+
filter->set("typewriter.cursor_char", "|");
221221
} else {
222222
filter = new Mlt::Filter(profile, "dynamictext");
223223
filter->set(kShotcutFilterProperty, kSimpleFilterName);
@@ -227,16 +227,29 @@ Mlt::Filter *TextProducerWidget::createFilter(Mlt::Profile &profile, Mlt::Produc
227227
filter->set("argument",
228228
tr("Edit your text using the Filters panel.").toUtf8().constData());
229229
}
230+
if (ui->typeWriterRadioButton->isChecked()) {
230231
#if defined(Q_OS_WIN)
231-
filter->set("family", "Verdana");
232+
filter->set("family", "Consolas");
232233
#elif defined(Q_OS_MAC)
233-
filter->set("family", "Helvetica");
234+
filter->set("family", "Monaco");
235+
#else
236+
filter->set("family", "monospace");
234237
#endif
238+
filter->set("outline", 0);
239+
filter->set("weight", QFont::Normal);
240+
fgcolor = "#ff00ff00";
241+
} else {
242+
#if defined(Q_OS_WIN)
243+
filter->set("family", "Verdana");
244+
#elif defined(Q_OS_MAC)
245+
filter->set("family", "Helvetica");
246+
#endif
247+
filter->set("outline", 3);
248+
filter->set("weight", QFont::Bold);
249+
}
235250
filter->set("fgcolour", fgcolor);
236251
filter->set("bgcolour", "#00000000");
237252
filter->set("olcolour", "#aa000000");
238-
filter->set("outline", 3);
239-
filter->set("weight", QFont::Bold * 10);
240253
filter->set("style", "normal");
241254
filter->set("shotcut:usePointSize", 1);
242255
filter->set("shotcut:pointSize", kPointSize);

0 commit comments

Comments
 (0)