From b3e26d17a25d0677e9e034133c0c4686862aa4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 9 Mar 2024 23:42:01 +0800 Subject: [PATCH] update --- example/example_zh.ts | 2 +- example/qml-Qt6/window/MainWindow.qml | 5 ++--- example/qml/window/MainWindow.qml | 5 ++--- src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml | 2 ++ src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/example/example_zh.ts b/example/example_zh.ts index 3fd4fadb..5f7ba7f0 100644 --- a/example/example_zh.ts +++ b/example/example_zh.ts @@ -680,7 +680,7 @@ Open in Separate Window - 单独窗口打开 + 在独立窗口中打开 diff --git a/example/qml-Qt6/window/MainWindow.qml b/example/qml-Qt6/window/MainWindow.qml index 2b8c2e21..8b593653 100644 --- a/example/qml-Qt6/window/MainWindow.qml +++ b/example/qml-Qt6/window/MainWindow.qml @@ -112,11 +112,10 @@ FluWindow { Component{ id: nav_item_right_menu FluMenu{ - id: menu - width: 130 + width: 186 FluMenuItem{ text: qsTr("Open in Separate Window") - visible: true + font.pixelSize: 12 onClicked: { FluApp.navigate("/pageWindow",{title:modelData.title,url:modelData.url}) } diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index d36e2b3f..56a2cb22 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -112,11 +112,10 @@ FluWindow { Component{ id: nav_item_right_menu FluMenu{ - id: menu - width: 130 + width: 186 FluMenuItem{ text: qsTr("Open in Separate Window") - visible: true + font.pixelSize: 12 onClicked: { FluApp.navigate("/pageWindow",{title:modelData.title,url:modelData.url}) } diff --git a/src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml b/src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml index f057b6fd..3fe917e4 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml @@ -40,6 +40,7 @@ T.MenuItem { icon.height: 24 icon.color: control.palette.windowText height: visible ? implicitHeight : 0 + font:FluTextStyle.Body Component{ id:com_icon FluIcon{ @@ -69,6 +70,7 @@ T.MenuItem { FluText { id:content_text text: control.text + font: control.font color: control.textColor anchors.verticalCenter: parent.verticalCenter } diff --git a/src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml b/src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml index 6417dd3d..a1577c6b 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml @@ -41,6 +41,7 @@ T.MenuItem { icon.height: 24 icon.color: control.palette.windowText height: visible ? implicitHeight : 0 + font:FluTextStyle.Body Component{ id:com_icon FluIcon{ @@ -70,6 +71,7 @@ T.MenuItem { FluText { id:content_text text: control.text + font: control.font color: control.textColor anchors.verticalCenter: parent.verticalCenter }