fix font size in text presets not applying

https://forum.shotcut.org/t/cant-lengthen-subtitles/47079/10
mltframework · Jan 7, 2025 · bd7a18b · bd7a18b
1 parent f2b2a9d
commit bd7a18b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/src/qml/filters/dynamictext/ui.qml b/src/qml/filters/dynamictext/ui.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2024 Meltytech, LLC
+ * Copyright (c) 2014-2025 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -164,6 +164,7 @@ Shotcut.KeyframableFilter {
             parameters: textFilterUi.parameterList.concat(['argument'])
             onBeforePresetLoaded: {
                 filter.resetProperty(textFilterUi.rectProperty);
+                filter.set(textFilterUi.pointSizeProperty, 0);
                 resetSimpleKeyframes();
             }
             onPresetSelected: {

diff --git a/src/qml/filters/gpstext/ui.qml b/src/qml/filters/gpstext/ui.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024 Meltytech, LLC
+ * Copyright (c) 2022-2025 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -686,6 +686,7 @@ Shotcut.KeyframableFilter {
             parameters: textFilterUi.parameterList.concat(['argument'])
             onBeforePresetLoaded: {
                 filter.resetProperty(textFilterUi.rectProperty);
+                filter.set(textFilterUi.pointSizeProperty, 0);
                 resetSimpleKeyframes();
             }
             onPresetSelected: {

diff --git a/src/qml/filters/subtitle/ui.qml b/src/qml/filters/subtitle/ui.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Meltytech, LLC
+ * Copyright (c) 2024-2025 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,6 +90,7 @@ Shotcut.KeyframableFilter {
             parameters: textFilterUi.parameterList.concat(['feed'])
             onBeforePresetLoaded: {
                 filter.resetProperty(textFilterUi.rectProperty);
+                filter.set(textFilterUi.pointSizeProperty, 0);
                 resetSimpleKeyframes();
             }
             onPresetSelected: {

diff --git a/src/qml/filters/timer/ui.qml b/src/qml/filters/timer/ui.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2024 Meltytech, LLC
+ * Copyright (c) 2018-2025 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -124,6 +124,7 @@ Shotcut.KeyframableFilter {
             parameters: textFilterUi.parameterList.concat(['format', 'direction', 'start', 'duration'])
             onBeforePresetLoaded: {
                 filter.resetProperty(textFilterUi.rectProperty);
+                filter.set(textFilterUi.pointSizeProperty, 0);
                 resetSimpleKeyframes();
             }
             onPresetSelected: {

diff --git a/src/qml/modules/Shotcut/Controls/TextFilterUi.qml b/src/qml/modules/Shotcut/Controls/TextFilterUi.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2023 Meltytech, LLC
+ * Copyright (c) 2014-2025 Meltytech, LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ GridLayout {
         var pointSize = parseInt(filter.get(pointSizeProperty));
         if (!pointSize) {
             var ratio = fontDialog.selectedFont.pointSize / fontDialog.selectedFont.pixelSize;
-            pointSize = filter.get('size') * ratio;
+            pointSize = Math.round(filter.get('size') * ratio);
         }
         return pointSize;
     }