diff --git a/example/T_Expander.qml b/example/T_Expander.qml index 0abe73df..87fbb682 100644 --- a/example/T_Expander.qml +++ b/example/T_Expander.qml @@ -46,13 +46,15 @@ FluScrollablePage{ headerText:"打开一个滑动文本框" Item{ anchors.fill: parent - ScrollView{ + Flickable{ id:scrollview width: parent.width height: parent.height - contentWidth: parent.width + contentWidth: width + contentHeight: text_info.height + ScrollBar.vertical: FluScrollBar {} FluText{ - id:test + id:text_info width: scrollview.width wrapMode: Text.WrapAnywhere padding: 14 diff --git a/example/T_MediaPlayer.qml b/example/T_MediaPlayer.qml index 63034154..e519f0a7 100644 --- a/example/T_MediaPlayer.qml +++ b/example/T_MediaPlayer.qml @@ -30,17 +30,13 @@ FluScrollablePage{ verticalCenter: parent.verticalCenter left:parent.left } - FluMediaPlayer{ id:player // source:"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4" source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" // source:"http://video.chinanews.com/flv/2019/04/23/400/111773_web.mp4" } - } } - - } diff --git a/example/page/MainPage.qml b/example/page/MainPage.qml index 17858406..08e98301 100644 --- a/example/page/MainPage.qml +++ b/example/page/MainPage.qml @@ -3,7 +3,6 @@ import QtQuick.Window 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.15 - import FluentUI 1.0 FluWindow { @@ -12,7 +11,7 @@ FluWindow { height: 640 title: "FluentUI" minimumWidth: 520 - minimumHeight: 400 + minimumHeight: 460 FluAppBar{ id:appbar diff --git a/src/colorpicker/content/SBPicker.qml b/src/colorpicker/content/SBPicker.qml index ab1b4c5a..c0b3fb57 100644 --- a/src/colorpicker/content/SBPicker.qml +++ b/src/colorpicker/content/SBPicker.qml @@ -48,6 +48,7 @@ Item { anchors.fill: parent x: r y: r + preventStealing: true function handleMouse(mouse) { if (mouse.buttons & Qt.LeftButton) { diff --git a/src/controls/FluMediaPlayer.qml b/src/controls/FluMediaPlayer.qml index 6f250161..0efc7dff 100644 --- a/src/controls/FluMediaPlayer.qml +++ b/src/controls/FluMediaPlayer.qml @@ -17,6 +17,7 @@ Rectangle { MouseArea{ anchors.fill: parent + preventStealing: true onClicked: { showControl = !showControl }