Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (3)
......@@ -187,14 +187,17 @@ FocusScope {
onMouseMoved: {
//short interval for mouse events
if (Player.isInteractive)
{
toggleControlBarButtonAutoHide.restart()
videoSurface.cursorShape = Qt.ArrowCursor
}
interactiveAutoHideTimer.restart()
else
playerToolbarVisibilityFSM.mouseMove();
}
Binding on cursorShape {
when: topBar.state === "hidden"
&& controlBar.state === "hidden"
&& !interactiveAutoHideTimer.running
value: Qt.BlankCursor
}
}
// background image
......@@ -303,7 +306,11 @@ FocusScope {
return controlBar
}
state: (playerToolbarVisibilityFSM.started && playerToolbarVisibilityFSM.isVisible) ? "visible" : "hidden"
//initial state value is "", using a binding avoid animation on startup
Binding on state {
when: playerToolbarVisibilityFSM.started
value: playerToolbarVisibilityFSM.isVisible ? "visible" : "hidden"
}
onTogglePlaylistVisibility: playlistVisibility.togglePlaylistVisibility()
......@@ -337,11 +344,6 @@ FocusScope {
visible: MainCtx.pinVideoControls
}
onStateChanged: {
videoSurface.cursorShape = state === "visible"
? Qt.ArrowCursor : Qt.BlankCursor
}
}
MouseArea {
......@@ -583,7 +585,11 @@ FocusScope {
focus: false
edge: Widgets.DrawerExt.Edges.Right
state: (playlistVisibility.started && playlistVisibility.isPlaylistVisible) ? "visible" : "hidden"
//initial state value is "", using a binding avoid animation on startup
Binding on state {
when: playlistVisibility.started
value: playlistVisibility.isPlaylistVisible ? "visible" : "hidden"
}
component: PlaylistListView {
id: playlistView
......@@ -685,23 +691,17 @@ FocusScope {
}
Timer {
// toggleControlBarButton's visibility depends on this timer
id: toggleControlBarButtonAutoHide
running: true
// NavigationBox's visibility depends on this timer
id: interactiveAutoHideTimer
running: false
repeat: false
interval: 3000
onTriggered: {
// Cursor hides when toggleControlBarButton is not visible
videoSurface.forceActiveFocus()
videoSurface.cursorShape = Qt.BlankCursor
}
}
NavigationBox {
id: navBox
visible: Player.isInteractive && navBox.show
&& (toggleControlBarButtonAutoHide.running
&& (interactiveAutoHideTimer.running
|| navBox.hovered || !rootPlayer.hasEmbededVideo)
x: rootPlayer.x + VLCStyle.margin_normal + VLCStyle.applicationHorizontalMargin
......@@ -718,10 +718,9 @@ FocusScope {
}
}
// NavigationBox's visibility depends on this timer
Connections {
target: MainCtx
function onNavBoxToggled() { toggleControlBarButtonAutoHide.restart() }
function onNavBoxToggled() { interactiveAutoHideTimer.restart() }
}
Connections {
......@@ -741,7 +740,7 @@ FocusScope {
visible: Player.isInteractive
&& rootPlayer.hasEmbededVideo
&& !(MainCtx.pinVideoControls && !Player.fullscreen)
&& (toggleControlBarButtonAutoHide.running === true
&& (interactiveAutoHideTimer.running === true
|| controlBar.state !== "hidden" || toggleControlBarButton.hovered)
focus: true
anchors {
......@@ -801,6 +800,7 @@ FocusScope {
return topBar
}
//initial state value is "", using a binding avoid animation on startup
Binding on state {
when: playerToolbarVisibilityFSM.started
value: playerToolbarVisibilityFSM.isVisible ? "visible" : "hidden"
......@@ -853,11 +853,7 @@ FocusScope {
Keys.onPressed: (event) => {
if (Player.isInteractive)
{
toggleControlBarButtonAutoHide.restart()
videoSurface.cursorShape = Qt.ArrowCursor
}
interactiveAutoHideTimer.restart()
else
playerToolbarVisibilityFSM.keyboardMove()
}
......
......@@ -43,15 +43,14 @@ FSM {
id: fsm
//incoming signals
//user clicked on the playlist button
signal togglePlaylistVisibility()
//playlist visibility update externally
signal updatePlaylistVisible()
signal updatePlaylistDocked()
signal updateVideoEmbed()
//internal signals
signal _updateVideoEmbed()
onUpdateVideoEmbed: _updateVideoEmbed()
//exposed internal states
property alias isPlaylistVisible: fsmVisible.active
......@@ -62,7 +61,6 @@ FSM {
updatePlaylistVisible: fsm.updatePlaylistVisible,
updatePlaylistDocked: fsm.updatePlaylistDocked,
updateVideoEmbed: fsm.updateVideoEmbed,
updateVideoEmbed: fsm._updateVideoEmbed,
})
FSMState {
......@@ -90,15 +88,14 @@ FSM {
guard: () => !MainCtx.playlistDocked,
target: fsmFloating
},
togglePlaylistVisibility: {
action: () => {
MainCtx.playlistVisible = !MainCtx.playlistVisible
}
},
})
FSMState {
id: fsmVisible
function enter() {
MainCtx.playlistVisible = true
}
transitions: ({
updateVideoEmbed: {
......@@ -107,7 +104,10 @@ FSM {
},
updatePlaylistVisible: {
guard: () => !MainCtx.playlistVisible,
target: fsmHidden
target: fsmFollowVisible
},
togglePlaylistVisibility: {
target: fsmFollowVisible
},
})
}
......@@ -121,9 +121,7 @@ FSM {
id: fsmFollowVisible
function enter() {
//automatic transitions
if (MainCtx.playlistVisible)
fsm.updatePlaylistVisible()
MainCtx.playlistVisible = false
}
transitions: ({
......@@ -135,6 +133,9 @@ FSM {
guard: () => MainCtx.playlistVisible,
target: fsmVisible
},
togglePlaylistVisibility: {
target: fsmVisible
},
})
}
......@@ -142,9 +143,15 @@ FSM {
id: fsmEmbed
transitions: ({
updateVideoEmbed: { //guards tested in order{
guard: () => !MainCtx.hasEmbededVideo,
updateVideoEmbed: [{ //guards tested in order{
guard: () => !MainCtx.hasEmbededVideo && !MainCtx.playlistVisible,
target: fsmFollowVisible
}, {
guard: () => !MainCtx.hasEmbededVideo && MainCtx.playlistVisible,
target: fsmVisible
}],
togglePlaylistVisibility: {
target: fsmVisible
},
updatePlaylistVisible: {
guard: () => MainCtx.playlistVisible,
......