vlc | branch: master | Pierre Lamot <[email protected]> | Mon Dec 23 14:02:47 2019 +0100| [78995f46c94a7010637bc16006e9dec8e13b32fe] | committer: Jean-Baptiste Kempf
qml: remove context indicator Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=78995f46c94a7010637bc16006e9dec8e13b32fe --- modules/gui/qt/network/qml/NetworkBrowseDisplay.qml | 1 - modules/gui/qt/network/qml/NetworkGridItem.qml | 1 - modules/gui/qt/widgets/qml/GridItem.qml | 15 +-------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml b/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml index 70bc3e351a..18806a5df8 100644 --- a/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml +++ b/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml @@ -174,7 +174,6 @@ Widgets.NavigableFocusScope { } subtitle: model.mrl || "" title: model.name || i18n.qtr("Unknown share") - showContextButton: true onItemClicked : { delegateModel.updateSelection( modifier , delegateModel.currentIndex, index) diff --git a/modules/gui/qt/network/qml/NetworkGridItem.qml b/modules/gui/qt/network/qml/NetworkGridItem.qml index f7086bf74c..b0cedb69fa 100644 --- a/modules/gui/qt/network/qml/NetworkGridItem.qml +++ b/modules/gui/qt/network/qml/NetworkGridItem.qml @@ -48,5 +48,4 @@ Widgets.GridItem { } subtitle: model.mrl title: model.name || i18n.qtr("Unknown share") - showContextButton: true } diff --git a/modules/gui/qt/widgets/qml/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml index 9ee78cb40f..8145ae23b1 100644 --- a/modules/gui/qt/widgets/qml/GridItem.qml +++ b/modules/gui/qt/widgets/qml/GridItem.qml @@ -33,7 +33,6 @@ Rectangle { property string title: "" property string subtitle: "" property bool selected: false - property bool showContextButton: isVideo property alias sourceSize: cover.sourceSize property string infoLeft: "" @@ -44,7 +43,6 @@ Rectangle { property string channel: "" property real pictureWidth: isVideo ? VLCStyle.video_normal_width : VLCStyle.cover_small property real pictureHeight: isVideo ? VLCStyle.video_normal_height : VLCStyle.cover_small - property alias contextButtonDown: contextButton.down width: gridItem.width height: gridItem.height @@ -121,16 +119,6 @@ Rectangle { } } } - ContextButton { - id: contextButton - visible: root.showContextButton - anchors { - top: cover.top - right: cover.right - } - color: "white" - onClicked: root.contextMenuButtonClicked(cover_bg) - } VideoQualityLabel { id: resolutionLabel @@ -218,8 +206,7 @@ Rectangle { font.pixelSize: VLCStyle.fontSize_normal property bool _needsToScroll: (textTitleRect.width < textTitle.width) - state: ((mouseArea.containsMouse - || contextButton.activeFocus || picture.highlighted) + state: ((mouseArea.containsMouse || picture.highlighted) && textTitle._needsToScroll) ? "HOVERED" : "RELEASED" states: [ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
