Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
b72d7b04 by Benjamin Arnaud at 2022-08-27T09:52:48+00:00
qml/NavigationWidget: Fix syntax
- - - - -
45de32be by Benjamin Arnaud at 2022-08-27T09:52:48+00:00
qml/NavigationWidget: Fix the 'requestLock' signal
- - - - -
1 changed file:
- modules/gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml
Changes:
=====================================
modules/gui/qt/player/qml/controlbarcontrols/NavigationWidget.qml
=====================================
@@ -80,7 +80,8 @@ Templates.Pane {
focus: (item && item.enabled)
// NOTE: We display the 'menu button' as a placeholder for the
customize dialog.
- source: (Player.hasMenu || root.paintOnly) ? _controlPath +
"DvdMenuButton.qml" : ""
+ source: (Player.hasMenu || root.paintOnly) ? root._controlPath +
"DvdMenuButton.qml"
+ : ""
Navigation.parentItem: root
@@ -105,14 +106,22 @@ Templates.Pane {
source: (Player.hasPrograms
&&
- root.paintOnly == false) ? _controlPath +
"ProgramButton.qml" : ""
+ root.paintOnly === false) ? root._controlPath +
"ProgramButton.qml" : ""
Navigation.parentItem: root
Navigation.leftItem: loaderA.item
Navigation.rightItem: loaderC.item
- onLoaded: if (item) _applyItem(loaderB, item)
+ onLoaded: {
+ if (item === null) return
+
+ _applyItem(loaderB, item)
+
+ item.requestLockUnlockAutoHide.connect(function(lock) {
+ controlLayout.requestLockUnlockAutoHide(lock)
+ })
+ }
}
Loader {
@@ -124,7 +133,7 @@ Templates.Pane {
source: (Player.isTeletextAvailable
&&
- root.paintOnly == false) ? _controlPath +
"TeletextWidget.qml" : ""
+ root.paintOnly === false) ? root._controlPath +
"TeletextWidget.qml" : ""
Navigation.parentItem: root
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/697cf07910f33399faa8ec19be37e4e6127b639f...45de32bea8cba85880a8ede25678bddd2f89b451
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/697cf07910f33399faa8ec19be37e4e6127b639f...45de32bea8cba85880a8ede25678bddd2f89b451
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
