vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Thu Feb 4 23:06:28 2021 +0530| [3e4622aa8b60e8aa03c1f57d9e3b7f695e6d1a8d] | committer: Pierre Lamot
qml: remove redundant container element Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e4622aa8b60e8aa03c1f57d9e3b7f695e6d1a8d --- modules/gui/qt/player/qml/Player.qml | 50 +++++++++++++++++------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/modules/gui/qt/player/qml/Player.qml b/modules/gui/qt/player/qml/Player.qml index d989fbd682..7f9e8dadbe 100644 --- a/modules/gui/qt/player/qml/Player.qml +++ b/modules/gui/qt/player/qml/Player.qml @@ -428,39 +428,35 @@ Widgets.NavigableFocusScope { state: "visible" edge: Widgets.DrawerExt.Edges.Bottom - component: Item { - id: controllerBarId + component: MouseArea { + id: controllerMouseArea - width: controlBarView.width - height: controllerId.implicitHeight + controllerId.anchors.bottomMargin property alias autoHide: controllerId.autoHide - MouseArea { - id: controllerMouseArea - hoverEnabled: true - anchors.fill: parent + height: controllerId.implicitHeight + controllerId.anchors.bottomMargin + width: controlBarView.width + hoverEnabled: true - ControlBar { - id: controllerId - focus: true - anchors.fill: parent - anchors.leftMargin: VLCStyle.applicationHorizontalMargin - anchors.rightMargin: VLCStyle.applicationHorizontalMargin - anchors.bottomMargin: VLCStyle.applicationVerticalMargin - colors: rootPlayer.colors - - lockAutoHide: playlistpopup.state === "visible" - || !player.hasVideoOutput - || !rootPlayer.hasEmbededVideo - || controllerMouseArea.containsMouse - onAutoHideChanged: { - if (autoHide) - toolbarAutoHide.restart() - } + ControlBar { + id: controllerId + focus: true + anchors.fill: parent + anchors.leftMargin: VLCStyle.applicationHorizontalMargin + anchors.rightMargin: VLCStyle.applicationHorizontalMargin + anchors.bottomMargin: VLCStyle.applicationVerticalMargin + colors: rootPlayer.colors - navigationParent: rootPlayer - navigationUpItem: playlistpopup.showPlaylist ? playlistpopup : (audioControls.visible ? audioControls : topcontrolView) + lockAutoHide: playlistpopup.state === "visible" + || !player.hasVideoOutput + || !rootPlayer.hasEmbededVideo + || controllerMouseArea.containsMouse + onAutoHideChanged: { + if (autoHide) + toolbarAutoHide.restart() } + + navigationParent: rootPlayer + navigationUpItem: playlistpopup.showPlaylist ? playlistpopup : (audioControls.visible ? audioControls : topcontrolView) } } } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits