[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml: correct invalid reference in Player

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
2c075976 by Fatih Uzunoglu at 2024-03-23T14:08:29+00:00
qml: correct invalid reference in Player

- - - - -
8ed07cf0 by Fatih Uzunoglu at 2024-03-23T14:08:29+00:00
qml: do not import player directory in NavigationBoxButton

importing player directory as Player
conflicts with the Player provided
by org.videolan.vlc module.

- - - - -
3d8fa03b by Fatih Uzunoglu at 2024-03-23T14:08:29+00:00
qml: use IconToolButton in NavigationBoxButton

IconControlButton is no more.

- - - - -


2 changed files:

- modules/gui/qt/player/qml/Player.qml
- modules/gui/qt/player/qml/controlbarcontrols/NavigationBoxButton.qml


Changes:

=====================================
modules/gui/qt/player/qml/Player.qml
=====================================
@@ -714,7 +714,7 @@ FocusScope {
                     || navBox.hovered || !rootPlayer.hasEmbededVideo)
 
         x: rootPlayer.x + VLCStyle.margin_normal + VLCStyle.applicationHorizontalMargin
-        y: controlBarView.y - navBox.height - VLCStyle.margin_normal
+        y: controlBar.y - navBox.height - VLCStyle.margin_normal
 
         dragXMin: 0
         dragXMax: rootPlayer.width - navBox.width


=====================================
modules/gui/qt/player/qml/controlbarcontrols/NavigationBoxButton.qml
=====================================
@@ -19,15 +19,14 @@
 import QtQuick 2.12
 
 import "qrc:///widgets/" as Widgets
-import "qrc:///player/" as Player
 import "qrc:///style/"
 
 import org.videolan.vlc 0.1
 
-Widgets.IconControlButton {
+Widgets.IconToolButton {
     visible: Player.isInteractive
-    iconText: VLCIcons.ic_fluent_arrow_move
-    text: I18n.qtr("Navigation Buttons")
+    text: VLCIcons.ic_fluent_arrow_move
+    description: I18n.qtr("Navigation Buttons")
 
     onClicked: MainCtx.navBoxToggled()
 }



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2b68d45d034a98ef84300d4d728578c8ca18497a...3d8fa03b17d45769ca866adb97598ee977cff467

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2b68d45d034a98ef84300d4d728578c8ca18497a...3d8fa03b17d45769ca866adb97598ee977cff467
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance