diff --git a/example/qml/App.qml b/example/qml/App.qml index f1781b6..1b79d23 100644 --- a/example/qml/App.qml +++ b/example/qml/App.qml @@ -2,10 +2,12 @@ import QtQuick.Window import QtQuick.Controls import QtQuick.Layouts +import QtMultimedia import FluentUI Window { id:app + MediaPlayer{} Component.onCompleted: { FluApp.init(app) FluTheme.darkMode = FluDarkMode.System diff --git a/src/imports/FluentUI/Controls/FluAppBar.qml b/src/imports/FluentUI/Controls/FluAppBar.qml index b0e50e3..283bca4 100644 --- a/src/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/imports/FluentUI/Controls/FluAppBar.qml @@ -55,7 +55,6 @@ Rectangle{ } RowLayout{ anchors.right: parent.right - visible: !isMac height: root.height spacing: 0 RowLayout{ @@ -87,6 +86,7 @@ Rectangle{ iconSize: 11 text:minimizeText radius: 0 + visible: !isMac iconColor: root.textColor color: hovered ? minimizeHoverColor : minimizeNormalColor onClicked: { @@ -100,7 +100,7 @@ Rectangle{ iconSource : d.isRestore ? FluentIcons.ChromeRestore : FluentIcons.ChromeMaximize color: hovered ? maximizeHoverColor : maximizeNormalColor Layout.alignment: Qt.AlignVCenter - visible: d.resizable + visible: d.resizable && !isMac radius: 0 iconColor: root.textColor text:d.isRestore?restoreText:maximizeText @@ -119,6 +119,7 @@ Rectangle{ text:closeText width: 40 height: 30 + visible: !isMac radius: 0 iconSize: 10 iconColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor diff --git a/src/imports/FluentUI/Controls/FluMediaPlayer.qml b/src/imports/FluentUI/Controls/FluMediaPlayer.qml index 077ad58..2362933 100644 --- a/src/imports/FluentUI/Controls/FluMediaPlayer.qml +++ b/src/imports/FluentUI/Controls/FluMediaPlayer.qml @@ -27,9 +27,9 @@ Rectangle { audioOutput: AudioOutput{ id:audio_output } - onErrorChanged: + onErrorStringChanged: (error)=> { - console.debug(error) + console.debug(errorString) } onPositionChanged: { if(autoSeek){