diff --git a/example/qml/Qt5/about.qml b/example/qml/Qt5/about.qml index 3d9ab0d..0de40d5 100644 --- a/example/qml/Qt5/about.qml +++ b/example/qml/Qt5/about.qml @@ -22,6 +22,8 @@ RibbonWindow { Image { source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true Layout.preferredHeight: 120 Layout.preferredWidth: height Layout.alignment: Qt.AlignHCenter diff --git a/example/qml/Qt5/example.qml b/example/qml/Qt5/example.qml index f4cf62d..d04a8a3 100644 --- a/example/qml/Qt5/example.qml +++ b/example/qml/Qt5/example.qml @@ -673,6 +673,8 @@ RibbonWindow { Image { source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true Layout.preferredHeight: 300 Layout.preferredWidth: height Layout.alignment: Qt.AlignHCenter diff --git a/example/qml/Qt6/about.qml b/example/qml/Qt6/about.qml index 9812c29..c3e1335 100644 --- a/example/qml/Qt6/about.qml +++ b/example/qml/Qt6/about.qml @@ -23,6 +23,8 @@ RibbonWindow { Image { source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true Layout.preferredHeight: 120 Layout.preferredWidth: height Layout.alignment: Qt.AlignHCenter diff --git a/example/qml/Qt6/example.qml b/example/qml/Qt6/example.qml index dc3e52d..4ed523e 100644 --- a/example/qml/Qt6/example.qml +++ b/example/qml/Qt6/example.qml @@ -673,6 +673,8 @@ RibbonWindow { Image { source: "qrc:/qt/qml/RibbonUI/resources/imgs/icon.png" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true Layout.preferredHeight: 300 Layout.preferredWidth: height Layout.alignment: Qt.AlignHCenter diff --git a/lib_source/qml/Qt5/RibbonBackStageView.qml b/lib_source/qml/Qt5/RibbonBackStageView.qml index c1af74f..a37848f 100644 --- a/lib_source/qml/Qt5/RibbonBackStageView.qml +++ b/lib_source/qml/Qt5/RibbonBackStageView.qml @@ -206,7 +206,7 @@ Popup { id :rib_icon iconSource: typeof(model.menu_icon) === "number" ? model.menu_icon : 0 iconSourceFilled: typeof(model.menu_icon_filled) === "number" ? model.menu_icon_filled : iconSource - iconSize: menu_label.contentHeight + iconSize: menu_label.visible ? menu_label.contentHeight : 16 visible: typeof(model.menu_icon) === "number" && model.menu_icon Layout.alignment: Qt.AlignVCenter filled: item_bg.view.currentIndex === index && item_bg.isCurrentMenu @@ -217,7 +217,9 @@ Popup { source: typeof(model.menu_icon) === "string" ? model.menu_icon : "" visible: typeof(model.menu_icon) === "string" fillMode:Image.PreserveAspectFit - height: menu_label.contentHeight + mipmap: true + autoTransform: true + height: menu_label.visible ? menu_label.contentHeight : 16 width: height Layout.alignment: Qt.AlignVCenter } @@ -231,6 +233,7 @@ Popup { elide: Text.ElideRight font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering + visible: text Layout.preferredWidth: { let w = 0 w += rib_icon.visible ? rib_icon.contentWidth : 0 diff --git a/lib_source/qml/Qt5/RibbonButton.qml b/lib_source/qml/Qt5/RibbonButton.qml index f9af0cd..adc1dc7 100644 --- a/lib_source/qml/Qt5/RibbonButton.qml +++ b/lib_source/qml/Qt5/RibbonButton.qml @@ -99,6 +99,8 @@ Button { source: typeof(root.iconSource) === "string" ? root.iconSource : "" visible: typeof(root.iconSource) === "string" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true height: label.visible ? label.contentHeight : 16 width: height Layout.alignment: Qt.AlignVCenter diff --git a/lib_source/qml/Qt5/RibbonMenuItem.qml b/lib_source/qml/Qt5/RibbonMenuItem.qml index 1bc3775..478d432 100644 --- a/lib_source/qml/Qt5/RibbonMenuItem.qml +++ b/lib_source/qml/Qt5/RibbonMenuItem.qml @@ -68,7 +68,7 @@ MenuItem { id :rib_icon iconSource: typeof(control.iconSource) === "number" ? control.iconSource : 0 iconSourceFilled: typeof(control.iconSourceFilled) === "number" ? control.iconSourceFilled : iconSource - iconSize: label.contentHeight + iconSize: label.visible ? label.contentHeight : 16 visible: typeof(control.iconSource) === "number" && control.iconSource Layout.alignment: Qt.AlignVCenter filled: pressed || checked @@ -79,7 +79,9 @@ MenuItem { source: typeof(control.iconSource) === "string" ? control.iconSource : "" visible: typeof(control.iconSource) === "string" fillMode:Image.PreserveAspectFit - height: label.contentHeight + mipmap: true + autoTransform: true + height: label.visible ? label.contentHeight : 16 width: height Layout.alignment: Qt.AlignVCenter } @@ -93,6 +95,7 @@ MenuItem { font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" color: textColor renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering + visible: text Layout.preferredWidth:{ let w = 0 w += rib_icon.visible ? rib_icon.contentWidth : 0 diff --git a/lib_source/qml/Qt5/RibbonPushButton.qml b/lib_source/qml/Qt5/RibbonPushButton.qml index 66e514e..a7802a1 100644 --- a/lib_source/qml/Qt5/RibbonPushButton.qml +++ b/lib_source/qml/Qt5/RibbonPushButton.qml @@ -62,6 +62,8 @@ Item { source: typeof(root.iconSource) === "string" ? root.iconSource : "" visible: typeof(root.iconSource) === "string" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true height: left.height width: height Layout.alignment: Qt.AlignVCenter diff --git a/lib_source/qml/Qt5/RibbonTitleBar.qml b/lib_source/qml/Qt5/RibbonTitleBar.qml index 60f0f90..9e5f3a7 100644 --- a/lib_source/qml/Qt5/RibbonTitleBar.qml +++ b/lib_source/qml/Qt5/RibbonTitleBar.qml @@ -56,7 +56,7 @@ Item { iconSourceFilled: typeof(control.titleIconSourceFilled) === "number" ? control.titleIconSourceFilled : iconSource iconSize: title_text.contentHeight visible: typeof(control.titleIconSource) === "number" - Layout.preferredHeight: title_text.contentHeight + Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16 Layout.preferredWidth: Layout.preferredHeight Layout.alignment: Qt.AlignVCenter filled: mouse.pressed @@ -82,7 +82,9 @@ Item { source: typeof(control.titleIconSource) === "string" ? control.titleIconSource : "" visible: typeof(control.titleIconSource) === "string" fillMode:Image.PreserveAspectFit - Layout.preferredHeight: title_text.contentHeight + mipmap: true + autoTransform: true + Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16 Layout.preferredWidth: Layout.preferredHeight Layout.alignment: Qt.AlignVCenter } @@ -93,6 +95,7 @@ Item { color: titleTextColor renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering Layout.alignment: Qt.AlignVCenter + visible: text Behavior on color { ColorAnimation { duration: 60 diff --git a/lib_source/qml/Qt6/RibbonBackStageView.qml b/lib_source/qml/Qt6/RibbonBackStageView.qml index c25c123..5e142fc 100644 --- a/lib_source/qml/Qt6/RibbonBackStageView.qml +++ b/lib_source/qml/Qt6/RibbonBackStageView.qml @@ -206,7 +206,7 @@ Popup { id :rib_icon iconSource: typeof(model.menu_icon) === "number" ? model.menu_icon : 0 iconSourceFilled: typeof(model.menu_icon_filled) === "number" ? model.menu_icon_filled : iconSource - iconSize: menu_label.contentHeight + iconSize: menu_label.visible ? menu_label.contentHeight : 16 visible: typeof(model.menu_icon) === "number" && model.menu_icon Layout.alignment: Qt.AlignVCenter filled: item_bg.view.currentIndex === index && item_bg.isCurrentMenu @@ -217,7 +217,9 @@ Popup { source: typeof(model.menu_icon) === "string" ? model.menu_icon : "" visible: typeof(model.menu_icon) === "string" fillMode:Image.PreserveAspectFit - height: menu_label.contentHeight + mipmap: true + autoTransform: true + height: menu_label.visible ? menu_label.contentHeight : 16 width: height Layout.alignment: Qt.AlignVCenter } @@ -231,6 +233,7 @@ Popup { elide: Text.ElideRight font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering + visible: text Layout.preferredWidth: { let w = 0 w += rib_icon.visible ? rib_icon.contentWidth : 0 diff --git a/lib_source/qml/Qt6/RibbonButton.qml b/lib_source/qml/Qt6/RibbonButton.qml index 3c8f805..ce7abb1 100644 --- a/lib_source/qml/Qt6/RibbonButton.qml +++ b/lib_source/qml/Qt6/RibbonButton.qml @@ -99,6 +99,8 @@ Button { source: typeof(root.iconSource) === "string" ? root.iconSource : "" visible: typeof(root.iconSource) === "string" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true height: label.visible ? label.contentHeight : 16 width: height Layout.alignment: Qt.AlignVCenter diff --git a/lib_source/qml/Qt6/RibbonMenuItem.qml b/lib_source/qml/Qt6/RibbonMenuItem.qml index e05a95a..d434c5d 100644 --- a/lib_source/qml/Qt6/RibbonMenuItem.qml +++ b/lib_source/qml/Qt6/RibbonMenuItem.qml @@ -68,7 +68,7 @@ MenuItem { id :rib_icon iconSource: typeof(control.iconSource) === "number" ? control.iconSource : 0 iconSourceFilled: typeof(control.iconSourceFilled) === "number" ? control.iconSourceFilled : iconSource - iconSize: label.contentHeight + iconSize: label.visible ? label.contentHeight : 16 visible: typeof(control.iconSource) === "number" && control.iconSource Layout.alignment: Qt.AlignVCenter filled: pressed || checked @@ -79,7 +79,9 @@ MenuItem { source: typeof(control.iconSource) === "string" ? control.iconSource : "" visible: typeof(control.iconSource) === "string" fillMode:Image.PreserveAspectFit - height: label.contentHeight + mipmap: true + autoTransform: true + height: label.visible ? label.contentHeight : 16 width: height Layout.alignment: Qt.AlignVCenter } @@ -93,6 +95,7 @@ MenuItem { font.family: Qt.platform.os === "osx" ? "PingFang SC" : "Microsoft YaHei UI" color: textColor renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering + visible: text Layout.preferredWidth:{ let w = 0 w += rib_icon.visible ? rib_icon.contentWidth : 0 diff --git a/lib_source/qml/Qt6/RibbonPushButton.qml b/lib_source/qml/Qt6/RibbonPushButton.qml index 9344253..85ce698 100644 --- a/lib_source/qml/Qt6/RibbonPushButton.qml +++ b/lib_source/qml/Qt6/RibbonPushButton.qml @@ -62,6 +62,8 @@ Item { source: typeof(root.iconSource) === "string" ? root.iconSource : "" visible: typeof(root.iconSource) === "string" fillMode:Image.PreserveAspectFit + mipmap: true + autoTransform: true height: left.height width: height Layout.alignment: Qt.AlignVCenter diff --git a/lib_source/qml/Qt6/RibbonTitleBar.qml b/lib_source/qml/Qt6/RibbonTitleBar.qml index c07018a..405cb06 100644 --- a/lib_source/qml/Qt6/RibbonTitleBar.qml +++ b/lib_source/qml/Qt6/RibbonTitleBar.qml @@ -56,7 +56,7 @@ Item { iconSourceFilled: typeof(control.titleIconSourceFilled) === "number" ? control.titleIconSourceFilled : iconSource iconSize: title_text.contentHeight visible: typeof(control.titleIconSource) === "number" - Layout.preferredHeight: title_text.contentHeight + Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16 Layout.preferredWidth: Layout.preferredHeight Layout.alignment: Qt.AlignVCenter filled: mouse.pressed @@ -82,7 +82,9 @@ Item { source: typeof(control.titleIconSource) === "string" ? control.titleIconSource : "" visible: typeof(control.titleIconSource) === "string" fillMode:Image.PreserveAspectFit - Layout.preferredHeight: title_text.contentHeight + mipmap: true + autoTransform: true + Layout.preferredHeight: title_text.visible ? title_text.contentHeight : 16 Layout.preferredWidth: Layout.preferredHeight Layout.alignment: Qt.AlignVCenter } @@ -93,6 +95,7 @@ Item { color: titleTextColor renderType: RibbonTheme.nativeText ? Text.NativeRendering : Text.QtRendering Layout.alignment: Qt.AlignVCenter + visible: text Behavior on color { ColorAnimation { duration: 60