Merge branch '4.9'

2025-08-12 06:39:04 +08:00 · 2021-04-09 15:56:38 +02:00 · 2021-04-09 15:56:38 +02:00 · 78dc5ce1c4
commit 78dc5ce1c4
parent 6fdd8d3a75 5ee8ca5ade
2 changed files with 2 additions and 1851 deletions
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@ -383,7 +383,7 @@ Item
                        animateContentY.to = contents.contentY;
                        animateContentY.running = true;
                    }
-                    function onSetActiveFocusToNextSetting()
+                    function onSetActiveFocusToNextSetting(forward)
                    {
                        if (forward == undefined || forward)
                        {
--- a/resources/texts/change_log.txt
+++ b/resources/texts/change_log.txt