diff --git a/example/example_en_US.ts b/example/example_en_US.ts index 70fa49cb..adb10814 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -1494,27 +1494,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han. - - + + close '%1' - - + + show '%1 - - + + This is an '%1' - + clear all info diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 6214065e..7582cf09 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -1620,27 +1620,27 @@ My only desire is to be permitted to drive out the traitors and restore the Han. - - + + close '%1' - - + + show '%1 - - + + This is an '%1' - + clear all info diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml index 7e68055b..733be7df 100644 --- a/example/qml/page/T_InfoBar.qml +++ b/example/qml/page/T_InfoBar.qml @@ -68,6 +68,7 @@ FluScrollablePage{ return } info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0) + info1.close() } } FluButton{ diff --git a/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml b/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml index 21b88b6c..ed467fcf 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml @@ -335,7 +335,7 @@ FluButton { if (hours === "12") { hours24 = (period === control.amText) ? 0 : 12; } else { - hours24 = (period === control.pmText) ? hours24 : hours24 + 12; + hours24 = (period === control.pmText) ? hours24 + 12 : hours24; } } date.setHours(hours24); diff --git a/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml b/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml index 7b70229b..d6799e73 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml @@ -335,7 +335,7 @@ FluButton { if (hours === "12") { hours24 = (period === control.amText) ? 0 : 12; } else { - hours24 = (period === control.pmText) ? hours24 : hours24 + 12; + hours24 = (period === control.pmText) ? hours24 + 12 : hours24; } } date.setHours(hours24);