41 changed files with 89 additions and 89 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -18,8 +18,10 @@ option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)

-set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../..")
-cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
+set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}")
+cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR)
+cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR)
+cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR)

 #设置QML插件输出目录，可以通过外部设置，如果外部没有设置就默认到<QT_SDK_DIR_PATH>\qml\FluentUI目录下
 set(FLUENTUI_QML_PLUGIN_DIRECTORY "" CACHE PATH "Path to FluentUI plugin")
--- a/example/example_zh.ts
+++ b/example/example_zh.ts
@ -680,7 +680,7 @@
        <location filename="qml/window/MainWindow.qml" line="118"/>
        <location filename="qml-Qt6/window/MainWindow.qml" line="118"/>
        <source>Open in Separate Window</source>
-        <translation type="unfinished">在独立窗口中打开</translation>
+        <translation type="unfinished">单独窗口打开</translation>
    </message>
    <message>
        <location filename="qml/window/MainWindow.qml" line="215"/>
--- a/example/qml-Qt6/page/T_Awesome.qml
+++ b/example/qml-Qt6/page/T_Awesome.qml
@ -62,7 +62,7 @@ FluContentPage {
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.top: item_icon.bottom
                width:parent.width
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                text: modelData.name
                horizontalAlignment: Text.AlignHCenter
            }
--- a/example/qml-Qt6/page/T_Badge.qml
+++ b/example/qml-Qt6/page/T_Badge.qml
@ -23,7 +23,7 @@ FluScrollablePage{
                right: parent.right
            }
            FluText{
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                width: parent.width
                text: qsTr("It usually appears in the upper right corner of the notification icon or avatar to display the number of messages that need to be processed")
            }
--- a/example/qml-Qt6/page/T_Expander.qml
+++ b/example/qml-Qt6/page/T_Expander.qml
@ -64,7 +64,7 @@ FluScrollablePage{
                        FluText{
                            id:text_info
                            width: scrollview.width
-                            wrapMode: Text.WrapAnywhere
+                            wrapMode: Text.WordWrap
                            padding: 14
                            text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work, the restoration of Han. Today, the empire is still divided in three, and our very survival is threatened. Yet still the officials at court and the soldiers throughout the realm remain loyal to you, your majesty. Because they remember the late emperor, all of them, and they wish to repay his kindness in service to you. This is the moment to extend your divine influence, to honour the memory of the late Emperor and strengthen the morale of your officers. It is not time to listen to bad advice, or close your ears to the suggestions of loyal men.
 The court and the administration are as one. Both must be judged by one standard. Those who are loyal and good must get what they deserve, but so must the evil-doers who break the law. This will demonstrate the justice of your rule. There cannot be one law for the court and another for the administration.
@ -97,7 +97,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
            FluText{
                id:text_info
                width: scrollview.width
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                padding: 14
                text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
            }
--- a/example/qml-Qt6/page/T_Home.qml
+++ b/example/qml-Qt6/page/T_Home.qml
@ -118,7 +118,7 @@ FluScrollablePage{
                            Layout.leftMargin: 20
                            color: FluColors.Grey120
                            font.pixelSize: 12
-                            wrapMode: Text.WrapAnywhere
+                            wrapMode: Text.WordWrap
                        }
                    }
                    FluIcon{
@ -214,7 +214,7 @@ FluScrollablePage{
                    id:item_desc
                    text:desc
                    color:FluColors.Grey120
-                    wrapMode: Text.WrapAnywhere
+                    wrapMode: Text.WordWrap
                    elide: Text.ElideRight
                    font: FluTextStyle.Caption
                    maximumLineCount: 2
--- a/example/qml-Qt6/page/T_Network.qml
+++ b/example/qml-Qt6/page/T_Network.qml
@ -552,7 +552,7 @@ FluContentPage{
            FluText{
                id:text_info
                width: scrollview.width
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                padding: 14
            }
        }
--- a/example/qml-Qt6/page/T_Timeline.qml
+++ b/example/qml-Qt6/page/T_Timeline.qml
@ -23,7 +23,7 @@ FluScrollablePage{
    Component{
        id:com_lable
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            font.bold: true
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: modelData.lable
@ -41,7 +41,7 @@ FluScrollablePage{
    Component{
        id:com_text
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: modelData.text
            font.bold: true
--- a/example/qml-Qt6/window/CrashWindow.qml
+++ b/example/qml-Qt6/window/CrashWindow.qml
@ -44,7 +44,7 @@ FluWindow {
            leftMargin: 10
            rightMargin: 10
        }
-        wrapMode: Text.WrapAnywhere
+        wrapMode: Text.WordWrap
        text: qsTr("We apologize for the inconvenience caused by an unexpected error")
        horizontalAlignment: Text.AlignHCenter
        verticalAlignment: Text.AlignVCenter
--- a/example/qml-Qt6/window/HotloadWindow.qml
+++ b/example/qml-Qt6/window/HotloadWindow.qml
@ -32,7 +32,7 @@ FluWindow {
                    text:loader.itemLodaer().sourceComponent.errorString()
                    color:"red"
                    anchors.fill: parent
-                    wrapMode: Text.WrapAnywhere
+                    wrapMode: Text.WordWrap
                    padding: 20
                    verticalAlignment: Qt.AlignVCenter
                    horizontalAlignment: Qt.AlignHCenter
--- a/example/qml-Qt6/window/MainWindow.qml
+++ b/example/qml-Qt6/window/MainWindow.qml
@ -13,8 +13,8 @@ FluWindow {

    id:window
    title: "FluentUI"
-    width: 1000
-    height: 680
+    width: 960
+    height: 600
    minimumWidth: 520
    minimumHeight: 200
    launchMode: FluWindowType.SingleTask
@ -112,10 +112,11 @@ FluWindow {
    Component{
        id: nav_item_right_menu
        FluMenu{
-            width: 186
+            id: menu
+            width: 130
            FluMenuItem{
                text: qsTr("Open in Separate Window")
-                font.pixelSize: 12
+                visible: true
                onClicked: {
                    FluApp.navigate("/pageWindow",{title:modelData.title,url:modelData.url})
                }
--- a/example/qml-Qt6/window/SingleInstanceWindow.qml
+++ b/example/qml-Qt6/window/SingleInstanceWindow.qml
@ -22,7 +22,7 @@ FluWindow {
    }

    FluText{
-        wrapMode: Text.WrapAnywhere
+        wrapMode: Text.WordWrap
        anchors{
            left: parent.left
            right: parent.right
--- a/example/qml/page/T_Awesome.qml
+++ b/example/qml/page/T_Awesome.qml
@ -62,7 +62,7 @@ FluContentPage {
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.top: item_icon.bottom
                width:parent.width
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                text: modelData.name
                horizontalAlignment: Text.AlignHCenter
            }
--- a/example/qml/page/T_Badge.qml
+++ b/example/qml/page/T_Badge.qml
@ -23,7 +23,7 @@ FluScrollablePage{
                right: parent.right
            }
            FluText{
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                width: parent.width
                text: qsTr("It usually appears in the upper right corner of the notification icon or avatar to display the number of messages that need to be processed")
            }
--- a/example/qml/page/T_Expander.qml
+++ b/example/qml/page/T_Expander.qml
@ -64,7 +64,7 @@ FluScrollablePage{
                        FluText{
                            id:text_info
                            width: scrollview.width
-                            wrapMode: Text.WrapAnywhere
+                            wrapMode: Text.WordWrap
                            padding: 14
                            text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work, the restoration of Han. Today, the empire is still divided in three, and our very survival is threatened. Yet still the officials at court and the soldiers throughout the realm remain loyal to you, your majesty. Because they remember the late emperor, all of them, and they wish to repay his kindness in service to you. This is the moment to extend your divine influence, to honour the memory of the late Emperor and strengthen the morale of your officers. It is not time to listen to bad advice, or close your ears to the suggestions of loyal men.
 The court and the administration are as one. Both must be judged by one standard. Those who are loyal and good must get what they deserve, but so must the evil-doers who break the law. This will demonstrate the justice of your rule. There cannot be one law for the court and another for the administration.
@ -97,7 +97,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
            FluText{
                id:text_info
                width: scrollview.width
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                padding: 14
                text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
            }
--- a/example/qml/page/T_Home.qml
+++ b/example/qml/page/T_Home.qml
@ -118,7 +118,7 @@ FluScrollablePage{
                            Layout.leftMargin: 20
                            color: FluColors.Grey120
                            font.pixelSize: 12
-                            wrapMode: Text.WrapAnywhere
+                            wrapMode: Text.WordWrap
                        }
                    }
                    FluIcon{
@ -214,7 +214,7 @@ FluScrollablePage{
                    id:item_desc
                    text:desc
                    color:FluColors.Grey120
-                    wrapMode: Text.WrapAnywhere
+                    wrapMode: Text.WordWrap
                    elide: Text.ElideRight
                    font: FluTextStyle.Caption
                    maximumLineCount: 2
--- a/example/qml/page/T_Network.qml
+++ b/example/qml/page/T_Network.qml
@ -552,7 +552,7 @@ FluContentPage{
            FluText{
                id:text_info
                width: scrollview.width
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                padding: 14
            }
        }
--- a/example/qml/page/T_Timeline.qml
+++ b/example/qml/page/T_Timeline.qml
@ -23,7 +23,7 @@ FluScrollablePage{
    Component{
        id:com_lable
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            font.bold: true
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: modelData.lable
@ -41,7 +41,7 @@ FluScrollablePage{
    Component{
        id:com_text
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: modelData.text
            font.bold: true
--- a/example/qml/window/CrashWindow.qml
+++ b/example/qml/window/CrashWindow.qml
@ -44,7 +44,7 @@ FluWindow {
            leftMargin: 10
            rightMargin: 10
        }
-        wrapMode: Text.WrapAnywhere
+        wrapMode: Text.WordWrap
        text: qsTr("We apologize for the inconvenience caused by an unexpected error")
        horizontalAlignment: Text.AlignHCenter
        verticalAlignment: Text.AlignVCenter
--- a/example/qml/window/HotloadWindow.qml
+++ b/example/qml/window/HotloadWindow.qml
@ -32,7 +32,7 @@ FluWindow {
                    text:loader.itemLodaer().sourceComponent.errorString()
                    color:"red"
                    anchors.fill: parent
-                    wrapMode: Text.WrapAnywhere
+                    wrapMode: Text.WordWrap
                    padding: 20
                    verticalAlignment: Qt.AlignVCenter
                    horizontalAlignment: Qt.AlignHCenter
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@ -13,8 +13,8 @@ FluWindow {

    id:window
    title: "FluentUI"
-    width: 1000
-    height: 680
+    width: 960
+    height: 600
    minimumWidth: 520
    minimumHeight: 200
    launchMode: FluWindowType.SingleTask
@ -112,10 +112,11 @@ FluWindow {
    Component{
        id: nav_item_right_menu
        FluMenu{
-            width: 186
+            id: menu
+            width: 130
            FluMenuItem{
                text: qsTr("Open in Separate Window")
-                font.pixelSize: 12
+                visible: true
                onClicked: {
                    FluApp.navigate("/pageWindow",{title:modelData.title,url:modelData.url})
                }
--- a/example/qml/window/SingleInstanceWindow.qml
+++ b/example/qml/window/SingleInstanceWindow.qml
@ -22,7 +22,7 @@ FluWindow {
    }

    FluText{
-        wrapMode: Text.WrapAnywhere
+        wrapMode: Text.WordWrap
        anchors{
            left: parent.left
            right: parent.right
--- a/src/FluFramelessHelper.cpp
+++ b/src/FluFramelessHelper.cpp
@ -20,12 +20,12 @@ static inline QByteArray qtNativeEventType()

 static inline bool isCompositionEnabled(){
    typedef HRESULT (WINAPI* DwmIsCompositionEnabledPtr)(BOOL *pfEnabled);
-    HMODULE module = ::LoadLibraryW(L"dwmapi.dll");
+    HMODULE module = LoadLibraryW(L"dwmapi.dll");
    if (module)
    {
        BOOL composition_enabled = false;
        DwmIsCompositionEnabledPtr dwm_is_composition_enabled;
-        dwm_is_composition_enabled= reinterpret_cast<DwmIsCompositionEnabledPtr>(::GetProcAddress(module, "DwmIsCompositionEnabled"));
+        dwm_is_composition_enabled= reinterpret_cast<DwmIsCompositionEnabledPtr>(GetProcAddress(module, "DwmIsCompositionEnabled"));
        if (dwm_is_composition_enabled)
        {
            dwm_is_composition_enabled(&composition_enabled);
@ -64,7 +64,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
        if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0)
        {
            wp->flags |= SWP_NOCOPYBITS;
-            *result = ::DefWindowProcW(hwnd, uMsg, wParam, lParam);
+            *result = 0;
            return true;
        }
        return false;
@ -82,7 +82,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
            return true;
        }
        int offsetSize = 0;
-        bool isMaximum = ::IsZoomed(hwnd);
+        bool isMaximum = IsZoomed(hwnd);
        offsetXY = QPoint(abs(clientRect->left - originalLeft),abs(clientRect->top - originalTop));
        if(isMaximum || _helper->fullScreen()){
            _helper->setOriginalPos(QPoint(originalLeft,originalTop));
@ -171,7 +171,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
        *result = FALSE;
        return true;
    }else if(uMsg == WM_NCACTIVATE){
-        *result = ::DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1);
+        *result = DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1);
        return true;
    }else if(uMsg == WM_GETMINMAXINFO){
 #if QT_VERSION < QT_VERSION_CHECK(6,2,4)
@ -322,21 +322,21 @@ void FluFramelessHelper::componentComplete(){
        HWND hwnd = reinterpret_cast<HWND>(window->winId());
        DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
        if(resizeable()){
-            ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_THICKFRAME);
+            SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_MAXIMIZEBOX | WS_THICKFRAME);
        }else{
-            ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME);
+            SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME);
        }
        LONG exstyle = ::GetWindowLong(hwnd, GWL_EXSTYLE);
        exstyle = exstyle | WS_EX_LAYERED;
-        ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, exstyle);
-        ::SetLayeredWindowAttributes(hwnd, RGB(251, 255, 242), 0, LWA_COLORKEY);
+        SetWindowLongPtr(hwnd, GWL_EXSTYLE, exstyle);
+        SetLayeredWindowAttributes(hwnd, RGB(251, 255, 242), 0, LWA_COLORKEY);
        connect(window,&QQuickWindow::activeChanged,this,[this,hwnd]{
            if(this->window->isActive()){
                LONG exstyle = ::GetWindowLong(hwnd, GWL_EXSTYLE);
                if(exstyle & WS_EX_LAYERED){
                    exstyle = exstyle &~ WS_EX_LAYERED;
-                    ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, exstyle);
-                    ::SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
+                    SetWindowLongPtr(hwnd, GWL_EXSTYLE, exstyle);
+                    SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
                }
            }
        });
@ -362,36 +362,36 @@ void FluFramelessHelper::componentComplete(){
 void FluFramelessHelper::_onScreenChanged(){
 #ifdef Q_OS_WIN
    HWND hwnd = reinterpret_cast<HWND>(window->winId());
-    ::SetWindowPos(hwnd,0,0,0,0,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
-    ::RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW);
+    SetWindowPos(hwnd,0,0,0,0,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
+    RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW);
 #endif
 }

 void FluFramelessHelper::showSystemMenu(QPoint point){
 #ifdef Q_OS_WIN
    HWND hwnd = reinterpret_cast<HWND>(window->winId());
-    DWORD style = ::GetWindowLongPtr(hwnd,GWL_STYLE);
-    ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_SYSMENU);
+    DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
+    SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_SYSMENU);
    const HMENU hMenu = ::GetSystemMenu(hwnd, FALSE);
    if(maximized() || fullScreen()){
-        ::EnableMenuItem(hMenu,SC_MOVE,MFS_DISABLED);
-        ::EnableMenuItem(hMenu,SC_RESTORE,MFS_ENABLED);
+        EnableMenuItem(hMenu,SC_MOVE,MFS_DISABLED);
+        EnableMenuItem(hMenu,SC_RESTORE,MFS_ENABLED);
    }else{
-        ::EnableMenuItem(hMenu,SC_MOVE,MFS_ENABLED);
-        ::EnableMenuItem(hMenu,SC_RESTORE,MFS_DISABLED);
+        EnableMenuItem(hMenu,SC_MOVE,MFS_ENABLED);
+        EnableMenuItem(hMenu,SC_RESTORE,MFS_DISABLED);
    }
    if(resizeable() && !maximized() && !fullScreen()){
-        ::EnableMenuItem(hMenu,SC_SIZE,MFS_ENABLED);
-        ::EnableMenuItem(hMenu,SC_MAXIMIZE,MFS_ENABLED);
+        EnableMenuItem(hMenu,SC_SIZE,MFS_ENABLED);
+        EnableMenuItem(hMenu,SC_MAXIMIZE,MFS_ENABLED);
    }else{
-        ::EnableMenuItem(hMenu,SC_SIZE,MFS_DISABLED);
-        ::EnableMenuItem(hMenu,SC_MAXIMIZE,MFS_DISABLED);
+        EnableMenuItem(hMenu,SC_SIZE,MFS_DISABLED);
+        EnableMenuItem(hMenu,SC_MAXIMIZE,MFS_DISABLED);
    }
-    const int result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), point.x()*window->devicePixelRatio(), point.y()*window->devicePixelRatio(), 0, hwnd, nullptr);
+    const int result = TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), point.x()*window->devicePixelRatio(), point.y()*window->devicePixelRatio(), 0, hwnd, nullptr);
    if (result != FALSE) {
-        ::PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
+        PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
    }
-    ::SetWindowLongPtr(hwnd, GWL_STYLE, style &~ WS_SYSMENU);
+    SetWindowLongPtr(hwnd, GWL_STYLE, style &~ WS_SYSMENU);
 #endif
 }

@ -400,9 +400,9 @@ void FluFramelessHelper::_onStayTopChange(){
 #ifdef Q_OS_WIN
    HWND hwnd = reinterpret_cast<HWND>(window->winId());
    if(isStayTop){
-        ::SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
    }else{
-        ::SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
    }
 #else
    window->setFlag(Qt::WindowStaysOnTopHint,isStayTop);
--- a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
@ -41,7 +41,7 @@ FluPopup {
            FluText{
                id:text_message
                font: FluTextStyle.Body
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                text:message
                width: parent.width
                topPadding: 4
@ -67,7 +67,7 @@ FluPopup {
                topPadding: 20
                leftPadding: 20
                rightPadding: 20
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
            }
            FluLoader{
                sourceComponent: com_message
--- a/src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
@ -45,7 +45,7 @@ Button {
            radius: parent.radius
            anchors{
                fill: parent
-                topMargin: control.enabled ? 0 : 0
+                topMargin: control.enabled ? 1 : 0
                leftMargin: control.enabled ? 1 : 0
                rightMargin: control.enabled ? 1 : 0
                bottomMargin: control.enabled ? 2 : 0
--- a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
@ -192,13 +192,13 @@ FluObject {
                    spacing: 5
                    FluText{
                        text:_super.text
-                        wrapMode: Text.WrapAnywhere
+                        wrapMode: Text.WordWrap
                        width: Math.min(implicitWidth,mcontrol.maxWidth)
                    }
                    FluText{
                        text: _super.moremsg
                        visible: _super.moremsg
-                        wrapMode : Text.WrapAnywhere
+                        wrapMode : Text.WordWrap
                        textColor: FluColors.Grey120
                        width: Math.min(implicitWidth,mcontrol.maxWidth)
                    }
--- a/src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluMenuItem.qml
@ -40,7 +40,6 @@ T.MenuItem {
    icon.height: 24
    icon.color: control.palette.windowText
    height: visible ? implicitHeight : 0
-    font:FluTextStyle.Body
    Component{
        id:com_icon
        FluIcon{
@ -70,7 +69,6 @@ T.MenuItem {
            FluText {
                id:content_text
                text: control.text
-                font: control.font
                color: control.textColor
                anchors.verticalCenter: parent.verticalCenter
            }
--- a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
@ -20,7 +20,7 @@ TextArea{
        return normalColor
    }
    font:FluTextStyle.Body
-    wrapMode: Text.WrapAnywhere
+    wrapMode: Text.WordWrap
    padding: 8
    leftPadding: padding+4
    renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
--- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
@ -141,7 +141,7 @@ Rectangle {
            id:item_text
            text: String(display)
            elide: Text.ElideRight
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            anchors{
                fill: parent
                leftMargin: 11
--- a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
@ -95,7 +95,7 @@ Item{
    Component{
        id:com_lable
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: {
                if(modelData.lable){
@ -110,7 +110,7 @@ Item{
    Component{
        id:com_text
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: modelData.text
            textFormat: Text.RichText
--- a/src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
@ -61,7 +61,7 @@ Button {
            radius: parent.radius
            anchors{
                fill: parent
-                topMargin: checked && enabled ? 0 : 0
+                topMargin: checked && enabled ? 1 : 0
                leftMargin: checked && enabled ? 1 : 0
                rightMargin: checked && enabled ? 1 : 0
                bottomMargin: checked && enabled ? 2 : 0
--- a/src/Qt5/imports/FluentUI/Controls/FluTour.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTour.qml
@ -145,7 +145,7 @@ Popup{
        FluText{
            id: text_desc
            font: FluTextStyle.Body
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            maximumLineCount: 4
            elide: Text.ElideRight
            text: d.step.description
--- a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
@ -41,7 +41,7 @@ FluPopup {
            FluText{
                id:text_message
                font: FluTextStyle.Body
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
                text:message
                width: parent.width
                topPadding: 4
@ -67,7 +67,7 @@ FluPopup {
                topPadding: 20
                leftPadding: 20
                rightPadding: 20
-                wrapMode: Text.WrapAnywhere
+                wrapMode: Text.WordWrap
            }
            FluLoader{
                sourceComponent: com_message
--- a/src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
@ -46,7 +46,7 @@ Button {
            radius: parent.radius
            anchors{
                fill: parent
-                topMargin: control.enabled ? 0 : 0
+                topMargin: control.enabled ? 1 : 0
                leftMargin: control.enabled ? 1 : 0
                rightMargin: control.enabled ? 1 : 0
                bottomMargin: control.enabled ? 2 : 0
--- a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
@ -192,13 +192,13 @@ FluObject {
                    spacing: 5
                    FluText{
                        text:_super.text
-                        wrapMode: Text.WrapAnywhere
+                        wrapMode: Text.WordWrap
                        width: Math.min(implicitWidth,mcontrol.maxWidth)
                    }
                    FluText{
                        text: _super.moremsg
                        visible: _super.moremsg
-                        wrapMode : Text.WrapAnywhere
+                        wrapMode : Text.WordWrap
                        textColor: FluColors.Grey120
                        width: Math.min(implicitWidth,mcontrol.maxWidth)
                    }
--- a/src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluMenuItem.qml
@ -41,7 +41,6 @@ T.MenuItem {
    icon.height: 24
    icon.color: control.palette.windowText
    height: visible ? implicitHeight : 0
-    font:FluTextStyle.Body
    Component{
        id:com_icon
        FluIcon{
@ -71,7 +70,6 @@ T.MenuItem {
            FluText {
                id:content_text
                text: control.text
-                font: control.font
                color: control.textColor
                anchors.verticalCenter: parent.verticalCenter
            }
--- a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
@ -21,7 +21,7 @@ TextArea{
        return normalColor
    }
    font:FluTextStyle.Body
-    wrapMode: Text.WrapAnywhere
+    wrapMode: Text.WordWrap
    padding: 8
    leftPadding: padding+4
    renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
--- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
@ -142,7 +142,7 @@ Rectangle {
            id:item_text
            text: String(display)
            elide: Text.ElideRight
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            anchors{
                fill: parent
                leftMargin: 11
--- a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
@ -95,7 +95,7 @@ Item{
    Component{
        id:com_lable
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: {
                if(modelData.lable){
@ -110,7 +110,7 @@ Item{
    Component{
        id:com_text
        FluText{
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
            text: modelData.text
            textFormat: Text.RichText
--- a/src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
@ -57,7 +57,7 @@ Button {
            radius: parent.radius
            anchors{
                fill: parent
-                topMargin: checked && enabled ? 0 : 0
+                topMargin: checked && enabled ? 1 : 0
                leftMargin: checked && enabled ? 1 : 0
                rightMargin: checked && enabled ? 1 : 0
                bottomMargin: checked && enabled ? 2 : 0
--- a/src/Qt6/imports/FluentUI/Controls/FluTour.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTour.qml
@ -145,7 +145,7 @@ Popup{
        FluText{
            id: text_desc
            font: FluTextStyle.Body
-            wrapMode: Text.WrapAnywhere
+            wrapMode: Text.WordWrap
            maximumLineCount: 4
            elide: Text.ElideRight
            text: d.step.description