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 (4)
......@@ -179,7 +179,6 @@ Control {
progressBarColor: activeFocus ? colors.accent : colors.playerControlBarFg
barHeight: VLCStyle.heightBar_xxsmall
enabled: player.playingState == PlayerController.PLAYING_STATE_PLAYING || player.playingState == PlayerController.PLAYING_STATE_PAUSED
parentWindow: g_root
colors: root.colors
Navigation.parentItem: root
......
......@@ -28,8 +28,6 @@ FocusScope {
implicitHeight: VLCStyle.maxControlbarControlHeight
property var parentWindow: g_root
property var colors: undefined
property var defaultSize: VLCStyle.icon_normal // default size for IconToolButton based controls
......
......@@ -30,7 +30,6 @@ Slider {
property bool _isHold: false
property bool _isSeekPointsShown: true
property alias parentWindow: timeTooltip.parentWindow
property alias backgroundColor: sliderRect.color
property alias progressBarColor: progressRect.color
......@@ -56,11 +55,11 @@ Slider {
visible: control.hovered
text: player.length.scale(timeTooltip.position).toString() +
text: player.length.scale(pos.x / control.width).toString() +
(player.hasChapters ?
" - " + player.chapters.getNameAtPosition(timeTooltip.position) : "")
mouseArea: sliderRectMouseArea
pos: Qt.point(sliderRectMouseArea.mouseX, 0)
colors: control.colors
}
......
......@@ -25,7 +25,7 @@ import "qrc:///widgets/" as Widgets
import "qrc:///style/"
Control {
AbstractButton {
id: artworkInfoItem
property bool paintOnly: false
......@@ -51,12 +51,8 @@ Control {
}
}
MouseArea {
id: artworkInfoMouseArea
anchors.fill: parent
visible: !paintOnly
onClicked: g_mainDisplay.showPlayer()
hoverEnabled: true
onClicked: {
g_mainDisplay.showPlayer()
}
background: Widgets.AnimatedBackground {
......@@ -114,7 +110,7 @@ Control {
visible: artworkInfoItem.visible
&& infoColumn.width < infoColumn.preferredWidth
&& (artworkInfoMouseArea.containsMouse || artworkInfoItem.visualFocus)
&& (artworkInfoItem.hovered || artworkInfoItem.visualFocus)
delay: 500
contentItem: Text {
......
......@@ -28,23 +28,23 @@ import "qrc:///style/"
import "qrc:///util/Helpers.js" as Helpers
Widgets.AnimatedBackground {
implicitWidth: fbLabel.width + VLCStyle.focus_border * 2
implicitHeight: fbLabel.height + VLCStyle.focus_border * 2
Control {
padding: VLCStyle.focus_border
activeBorderColor: colors.bgFocus
Keys.priority: Keys.AfterItem
Keys.onPressed: Navigation.defaultKeyAction(event)
property bool paintOnly: false
property VLCColors colors: VLCStyle.colors
Widgets.MenuLabel {
id: fbLabel
anchors.centerIn: parent
background: Widgets.AnimatedBackground {
active: visualFocus
activeBorderColor: colors.bgFocus
}
contentItem: Widgets.MenuLabel {
text: i18n.qtr("WIDGET\nNOT\nFOUND")
horizontalAlignment: Text.AlignHCenter
color: colors.text
}
}
......@@ -33,9 +33,6 @@ FocusScope{
property bool paintOnly: false
property color color: colors.buttonText
property alias parentWindow: volumeTooltip.parentWindow
property VLCColors colors: VLCStyle.colors
readonly property var _player: paintOnly ? ({ muted: false, volume: .5 }) : player
......@@ -173,20 +170,14 @@ FocusScope{
id: volumeTooltip
active: !paintOnly
property var parentWindow: (typeof playerButtonsLayout === "undefined") ? g_root : playerButtonsLayout.parentWindow
sourceComponent: Widgets.PointingTooltip {
visible: sliderMouseArea.containsMouse
visible: sliderMouseArea.pressed || sliderMouseArea.containsMouse
text: Math.round(volControl.value * 100) + "%"
mouseArea: sliderMouseArea
xPos: (handle.x + handle.width / 2)
pos: Qt.point(handle.x + handle.width / 2, 0)
colors: widgetfscope.colors
parentWindow: volumeTooltip.parentWindow
}
}
......
......@@ -166,8 +166,8 @@ Item {
property color sliderBarMiniplayerBgColor: isThemeDark ? "#FF929292" : "#FFEEEEEE"
property color tooltipTextColor: systemPalette.tooltipText
property color tooltipColor: systemPalette.tooltip
property color tooltipTextColor: isThemeDark ? white : black
property color tooltipColor: isThemeDark ? black : white
//vlc orange
property color accent: (isThemeDark) ? "#ff8800" : "#ff610a"
......@@ -312,6 +312,9 @@ Item {
expandDelegate: bg
isThemeDark: systemPalette.isDark
tooltipColor: systemPalette.tooltip
tooltipTextColor: systemPalette.tooltipText
}
}
]
......
......@@ -17,131 +17,63 @@
*****************************************************************************/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtGraphicalEffects 1.0
import "qrc:///style/"
Item {
ToolTip {
id: pointingTooltip
// set parentWindow if you want to let tooltip not exceed window boundaries
// if it is not set, tooltip will use mouseArea as the bounding rect.
// Note that for now it only works with x axis.
property var parentWindow: g_root
margins: 0
padding: VLCStyle.margin_xxsmall
property var mouseArea: undefined
x: _x
y: pos.y - (implicitHeight + arrowArea.implicitHeight + VLCStyle.dp(7.5))
property alias text: timeMetrics.text
// set fixedY if you want to fix y position of the tooltip
property bool fixedY: true
readonly property real position: xPos / mouseArea.width
property real xPos: Math.max(Math.min(mouseArea.mouseX, mouseArea.width), 0.0)
property real yPos: Math.max(Math.min(mouseArea.mouseY, mouseArea.height), 0.0)
font.pixelSize: VLCStyle.fontSize_normal
property VLCColors colors: VLCStyle.colors
width: childrenRect.width
height: childrenRect.height
function getX() {
var x = xPos - (pointingTooltip.width / 2)
var diff = (x + pointingTooltip.width)
var windowMappedX = !!parentWindow ? parentWindow.mapFromItem(mouseArea, mouseArea.x, mouseArea.y).x : undefined
var sliderRealX = 0
if (!!parentWindow) {
diff -= parentWindow.width - windowMappedX
sliderRealX = windowMappedX
} else {
diff -= mouseArea.width
}
readonly property real _x: pos.x - (width / 2)
property point pos
if (x < -sliderRealX) {
if (!!parentWindow)
arrow.diff = x + windowMappedX
else
arrow.diff = x
x = -sliderRealX
} else if (diff > 0) {
arrow.diff = diff
x -= (diff)
} else {
arrow.diff = 0
}
return x
contentItem: Label {
text: pointingTooltip.text
font: pointingTooltip.font
color: colors.tooltipTextColor
}
y: fixedY ? -(childrenRect.height) : yPos - childrenRect.height
x: getX()
Item {
height: arrow.height * Math.sqrt(2)
width: timeIndicatorRect.width
anchors.horizontalCenter: timeIndicatorRect.horizontalCenter
anchors.verticalCenter: timeIndicatorRect.bottom
anchors.verticalCenterOffset: height / 2
clip: true
Rectangle {
id: arrow
width: VLCStyle.dp(10, VLCStyle.scale)
height: VLCStyle.dp(10, VLCStyle.scale)
anchors.centerIn: parent
anchors.verticalCenterOffset: -(parent.height / 2)
anchors.horizontalCenterOffset: diff
background: Rectangle {
border.color: colors.border
color: colors.tooltipColor
radius: VLCStyle.dp(6, VLCStyle.scale)
property int diff: 0
Item {
id: arrowArea
color: colors.bgAlt
z: 1
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.bottom
anchors.topMargin: -(parent.border.width)
rotation: 45
implicitHeight: arrow.implicitHeight * Math.sqrt(2) / 2
RectangularGlow {
anchors.fill: parent
glowRadius: VLCStyle.dp(2, VLCStyle.scale)
spread: 0.2
color: colors.glowColor
}
}
}
clip: true
Rectangle {
id: timeIndicatorRect
width: timeMetrics.width + VLCStyle.dp(10, VLCStyle.scale)
height: timeMetrics.height + VLCStyle.dp(5, VLCStyle.scale)
Rectangle {
id: arrow
color: colors.bgAlt
radius: VLCStyle.dp(6, VLCStyle.scale)
RectangularGlow {
anchors.fill: parent
glowRadius: VLCStyle.dp(2, VLCStyle.scale)
cornerRadius: parent.radius
spread: 0.2
color: colors.glowColor
}
anchors.horizontalCenter: parent.horizontalCenter
anchors.horizontalCenterOffset: _x - pointingTooltip.x
anchors.verticalCenter: parent.top
Label {
anchors.fill: parent
text: timeMetrics.text
color: colors.text
font: timeMetrics.font
implicitWidth: VLCStyle.dp(10, VLCStyle.scale)
implicitHeight: VLCStyle.dp(10, VLCStyle.scale)
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
rotation: 45
TextMetrics {
id: timeMetrics
font.pixelSize: VLCStyle.fontSize_normal
color: background.color
border.color: background.border.color
}
}
}
......