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 (7)
......@@ -30,11 +30,25 @@ import "qrc:///style/"
Widgets.NavigableFocusScope {
id: root
property variant model: MLAlbumModel{}
implicitHeight: artAndControl.height + VLCStyle.margin_large + VLCStyle.margin_xxsmall
implicitWidth: layout.implicitWidth
property var model
signal retract()
implicitWidth: layout.implicitWidth
implicitHeight: {
var verticalMargins = layout.anchors.topMargin + layout.anchors.bottomMargin
if (tracks.contentHeight < artAndControl.height)
return artAndControl.height + verticalMargins
return Math.min(tracks.contentHeight
, tracks.listView.headerItem.height + tracks.rowHeight * 6) // show a maximum of 6 rows
+ verticalMargins
}
// components should shrink with change of height, but it doesn't happen fast enough
// causing expand and shrink animation bit laggy, so clip the delegate to fix it
clip: true
Rectangle {
anchors.fill: parent
color: VLCStyle.colors.bgAlt
......@@ -134,123 +148,118 @@ Widgets.NavigableFocusScope {
}
navigationParent: root
navigationRightItem: expand_track_id
navigationRightItem: tracks
}
}
}
/* The list of the tracks available */
MusicTrackListDisplay {
id: tracks
ColumnLayout {
id: expand_infos_id
spacing: 0
readonly property int _nbCols: VLCStyle.gridColumnsForWidth(tracks.availableRowWidth)
Layout.fillWidth: true
Layout.fillHeight: true
property Component titleDelegate: RowLayout {
property var rowModel: parent.rowModel
RowLayout {
Layout.fillWidth: true
Layout.preferredHeight: expand_infos_title_id.implicitHeight
anchors.fill: parent
/* The title of the albums */
Widgets.SubtitleLabel {
id: expand_infos_title_id
Widgets.ListLabel {
text: !!rowModel && !!rowModel.track_number ? rowModel.track_number : ""
color: foregroundColor
font.weight: Font.Normal
text: model.title || i18n.qtr("Unknown title")
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
Layout.fillHeight: true
Layout.leftMargin: VLCStyle.margin_xxsmall
Layout.preferredWidth: VLCStyle.margin_large
}
Widgets.IconLabel {
text: VLCIcons.close
Widgets.ListLabel {
text: !!rowModel && !!rowModel.title ? rowModel.title : ""
color: foregroundColor
MouseArea {
anchors.fill: parent
onClicked: root.retract()
}
Layout.fillHeight: true
Layout.fillWidth: true
}
}
Widgets.CaptionLabel {
id: expand_infos_subtitle_id
property Component titleHeaderDelegate: Row {
text: i18n.qtr("%1 - %2 - %3")
.arg(model.main_artist || i18n.qtr("Unknown artist"))
.arg(model.release_year || "")
.arg(Helpers.msToString(model.duration) || "")
Widgets.CaptionLabel {
text: "#"
width: VLCStyle.margin_large
}
Layout.fillWidth: true
Layout.preferredHeight: implicitHeight
Widgets.CaptionLabel {
text: i18n.qtr("Title")
}
}
/* The list of the tracks available */
MusicTrackListDisplay {
id: expand_track_id
readonly property int _nbCols: VLCStyle.gridColumnsForWidth(expand_track_id.availableRowWidth)
header: Column {
width: tracks.width
height: implicitHeight
bottomPadding: VLCStyle.margin_large
property Component titleDelegate: RowLayout {
property var rowModel: parent.rowModel
RowLayout {
width: parent.width
anchors.fill: parent
/* The title of the albums */
Widgets.SubtitleLabel {
id: expand_infos_title_id
Widgets.ListLabel {
text: rowModel ? rowModel.track_number : ""
color: foregroundColor
font.weight: Font.Normal
text: model.title || i18n.qtr("Unknown title")
Layout.fillHeight: true
Layout.preferredWidth: VLCStyle.margin_large
Layout.fillWidth: true
}
Widgets.ListLabel {
text: rowModel ? rowModel.title : ""
color: foregroundColor
Widgets.IconLabel {
text: VLCIcons.close
Layout.fillHeight: true
Layout.fillWidth: true
Layout.rightMargin: VLCStyle.margin_small
MouseArea {
anchors.fill: parent
onClicked: root.retract()
}
}
}
property Component titleHeaderDelegate: Row {
Widgets.CaptionLabel {
text: "#"
width: VLCStyle.margin_large
}
Widgets.CaptionLabel {
id: expand_infos_subtitle_id
Widgets.CaptionLabel {
text: i18n.qtr("Title")
}
width: parent.width
text: i18n.qtr("%1 - %2 - %3")
.arg(model.main_artist || i18n.qtr("Unknown artist"))
.arg(model.release_year || "")
.arg(Helpers.msToString(model.duration) || "")
}
}
section.property: ""
headerPositioning: ListView.InlineHeader
section.property: ""
Layout.fillWidth: true
Layout.fillHeight: true
Layout.topMargin: VLCStyle.margin_large
Layout.fillWidth: true
Layout.fillHeight: true
rowHeight: VLCStyle.tableRow_height
headerColor: VLCStyle.colors.bgAlt
rowHeight: VLCStyle.tableRow_height
headerColor: VLCStyle.colors.bgAlt
parentId : root.model.id
onParentIdChanged: {
currentIndex = 0
}
parentId: root.model.id
onParentIdChanged: {
currentIndex = 0
}
sortModel: [
{ isPrimary: true, criteria: "title", width: VLCStyle.colWidth(Math.max(expand_track_id._nbCols - 1, 1)), visible: true, text: i18n.qtr("Title"), showSection: "", colDelegate: titleDelegate, headerDelegate: titleHeaderDelegate },
{ criteria: "duration", width: VLCStyle.colWidth(1), visible: true, showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
]
sortModel: [
{ isPrimary: true, criteria: "title", width: VLCStyle.colWidth(Math.max(tracks._nbCols - 1, 1)), visible: true, text: i18n.qtr("Title"), showSection: "", colDelegate: titleDelegate, headerDelegate: titleHeaderDelegate },
{ criteria: "duration", width: VLCStyle.colWidth(1), visible: true, showSection: "", colDelegate: tableColumns.timeColDelegate, headerDelegate: tableColumns.timeHeaderDelegate },
]
navigationParent: root
navigationLeftItem: actionButtons
navigationParent: root
navigationLeftItem: actionButtons
Widgets.TableColumns {
id: tableColumns
}
Widgets.TableColumns {
id: tableColumns
}
}
}
......
......@@ -443,7 +443,13 @@ NavigableFocusScope {
sourceComponent: expandDelegate
active: root.expandIndex !== -1
focus: active
onLoaded: item.height = 0
onLoaded: {
item.height = 0
// only make loader visible after setting initial y pos from layout() as to not get flickering
expandItemLoader.visible = false
}
}
......@@ -551,6 +557,8 @@ NavigableFocusScope {
if (root.expandIndex !== -1) {
var expandItemPos = root.getItemPos(expandItemGridId)
expandItem.y = expandItemPos[1]
if (!expandItemLoader.visible)
expandItemLoader.visible = true
}
// Place the delegates after the expandItem
......
......@@ -89,6 +89,7 @@ NavigableFocusScope {
property Item dragItem
property alias listScrollBar: view.listScrollBar
property alias listView: view.listView
property alias displayMarginEnd: view.displayMarginEnd
......@@ -98,6 +99,10 @@ NavigableFocusScope {
view.positionViewAtIndex(index, mode)
}
function positionViewAtBeginning() {
view.listView.positionViewAtBeginning()
}
Timer {
id: availableRowWidthUpdater
......@@ -158,6 +163,12 @@ NavigableFocusScope {
visible: view.modelCount > 0
z: 3
// with inline header positioning and for `root.header` which changes it's height after loading,
// in such cases after `root.header` completes, the ListView will try to maintain the relative contentY,
// and hide the completed `root.header`, try to show the `root.header` in such cases by manually
// positiing view at beginning
onHeightChanged: if (root.contentY < 0) root.positionViewAtBeginning()
Widgets.ListLabel {
x: contentX - VLCStyle.table_section_width
y: row.y
......