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 (5)
Showing with 92 additions and 63 deletions
......@@ -17,6 +17,7 @@
*****************************************************************************/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Templates 2.4 as T
import QtQuick.Layouts 1.11
import "qrc:///widgets/" as Widgets
......@@ -143,7 +144,7 @@ WindowDialog {
MainCtx.controlbarProfileModel.selectedProfile = (MainCtx.controlbarProfileModel.rowCount() - 1)
}
toolTip.visible: hovered
T.ToolTip.visible: hovered
}
Widgets.IconToolButton {
......@@ -156,7 +157,7 @@ WindowDialog {
MainCtx.controlbarProfileModel.currentModel.injectDefaults(false)
}
toolTip.visible: hovered
T.ToolTip.visible: hovered
}
Widgets.IconToolButton {
......@@ -167,7 +168,7 @@ WindowDialog {
MainCtx.controlbarProfileModel.deleteSelectedProfile()
}
toolTip.visible: hovered
T.ToolTip.visible: hovered
}
}
......
......@@ -53,6 +53,9 @@
#include <QDate>
#include <QMimeData>
#include <QQmlProperty>
#include <QQmlContext>
#include <QWindow>
#include <QScreen>
#ifdef _WIN32
......@@ -863,3 +866,42 @@ void MainCtx::setSettingValue(const QString &key, const QVariant &value)
{
settings->setValue(key, value);
}
void MainCtx::setAttachedToolTip(QObject *toolTip)
{
// See QQuickToolTipAttachedPrivate::instance(bool create)
assert(toolTip);
// Prevent possible invalid down-casting:
assert(toolTip->inherits("QQuickToolTip"));
QQmlEngine* const engine = qmlEngine(toolTip);
assert(engine);
assert(engine->objectOwnership(toolTip) == QQmlEngine::ObjectOwnership::JavaScriptOwnership);
// Dynamic internal property:
static const char* const name = "_q_QQuickToolTip";
if (const auto obj = engine->property(name).value<QObject *>())
{
if (engine->objectOwnership(obj) == QQmlEngine::ObjectOwnership::CppOwnership)
obj->deleteLater();
}
// setProperty() will return false, so there is no
// need to check the return value:
engine->setProperty(name, QVariant::fromValue(toolTip));
// Check if the attached tooltip is actually the
// one that is set
#ifndef NDEBUG
QQmlComponent component(engine);
component.setData(QByteArrayLiteral("import QtQuick 2.11; import QtQuick.Controls 2.4; Item { }"), {});
QObject* const obj = component.create();
assert(obj);
// Consider disabling setting of custom attached
// tooltip if the following assertion fails:
assert(QQmlProperty::read(obj, QStringLiteral("ToolTip.toolTip"), qmlContext(obj)).value<QObject*>() == toolTip);
obj->deleteLater();
#endif
}
......@@ -289,6 +289,8 @@ public:
Q_INVOKABLE QVariant settingValue(const QString &key, const QVariant &defaultValue) const;
Q_INVOKABLE void setSettingValue(const QString &key, const QVariant &value);
Q_INVOKABLE static void setAttachedToolTip(QObject* toolTip);
protected:
/* Systray */
void createSystray();
......
......@@ -51,6 +51,19 @@ Item {
value: root.height
}
Widgets.ToolTipExt {
id: attachedToolTip
parent: null
z: 99
colors: parent && parent.colors ? parent.colors
: VLCStyle.colors
Component.onCompleted: {
MainCtx.setAttachedToolTip(this)
}
}
Loader {
id: playlistWindowLoader
asynchronous: true
......
......@@ -153,10 +153,9 @@ T.Popup {
highlighted: index === 3
&& Player.subtitleTracks.multiSelect
toolTip.visible: (hovered || activeFocus)
toolTip.text: modelData.tooltip
toolTip.delay: 1000
toolTip.z: 2
T.ToolTip.visible: (hovered || activeFocus)
T.ToolTip.text: modelData.tooltip
T.ToolTip.delay: 1000
Navigation.parentItem: btnsCol
......
......@@ -106,18 +106,14 @@ AbstractButton {
mipmap: true
Widgets.ToolTipExt {
x: parent.x
visible: artworkInfoItem.visible
&& infoColumn.width < infoColumn.implicitWidth
&& (artworkInfoItem.hovered || artworkInfoItem.visualFocus)
delay: 500
text: I18n.qtr("%1\n%2\n%3").arg(titleLabel.text).arg(artistLabel.text).arg(progressIndicator.text)
colors: artworkInfoItem.colors
}
ToolTip.visible: infoColumn.width < infoColumn.implicitWidth
&& (artworkInfoItem.hovered || artworkInfoItem.visualFocus)
ToolTip.delay: VLCStyle.delayToolTipAppear
ToolTip.text: I18n.qtr("%1\n%2\n%3").arg(titleLabel.text)
.arg(artistLabel.text)
.arg(progressIndicator.text)
property alias colors: artworkInfoItem.colors
}
}
......
......@@ -63,7 +63,7 @@ T.Pane {
colors: root.colors
color: colors.text
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.rightItem: teleTransparencyBtn
......@@ -88,7 +88,7 @@ T.Pane {
colors: root.colors
color: colors.text
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.leftItem: teleActivateBtn
......@@ -161,7 +161,7 @@ T.Pane {
color: "grey"
colorDisabled: "grey"
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.leftItem: telePageNumber
......@@ -186,7 +186,7 @@ T.Pane {
color: "red"
colorDisabled: "grey"
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.leftItem: indexKeyBtn
......@@ -211,7 +211,7 @@ T.Pane {
color: "green"
colorDisabled: "grey"
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.leftItem: redKeyBtn
......@@ -236,7 +236,7 @@ T.Pane {
color: "yellow"
colorDisabled: "grey"
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.leftItem: greenKeyBtn
......@@ -261,7 +261,7 @@ T.Pane {
color: "blue"
colorDisabled: "grey"
toolTip.visible: hovered || visualFocus
T.ToolTip.visible: hovered || visualFocus
Navigation.parentItem: root
Navigation.leftItem: yellowKeyBtn
......
......@@ -43,6 +43,8 @@ T.Control {
readonly property bool containsDrag: (topContainsDrag || bottomContainsDrag)
readonly property VLCColors colors: root.colors
// Settings
topPadding: VLCStyle.margin_xxsmall
......@@ -61,32 +63,19 @@ T.Control {
ListView.delayRemove: mouseArea.drag.active
// Events
T.ToolTip.visible: ( (visualFocus || hovered) &&
!overlayMenu.shown && MainCtx.playlistVisible &&
(textInfoColumn.implicitWidth > textInfoColumn.width) )
onHoveredChanged: {
if (hovered)
adjustTooltip()
}
T.ToolTip.timeout: (hovered ? 0 : VLCStyle.ms2000)
onVisualFocusChanged: {
if (visualFocus)
adjustTooltip()
}
T.ToolTip.text: (textInfo.text + '\n' + textArtist.text)
// Functions
T.ToolTip.delay: VLCStyle.delayToolTipAppear
function adjustTooltip() {
plInfoTooltip.close()
plInfoTooltip.text = Qt.binding(function() { return (textInfo.text + '\n' + textArtist.text); })
plInfoTooltip.parent = textInfoColumn
if (hovered)
plInfoTooltip.timeout = 0
else
plInfoTooltip.timeout = 2000
plInfoTooltip.visible = Qt.binding(function() { return ( (visualFocus || hovered) && !mouseArea.drag.active &&
!overlayMenu.shown && MainCtx.playlistVisible &&
(textInfo.implicitWidth > textInfo.width || textArtist.implicitWidth > textArtist.width) ) })
}
// Events
// Functions
// Childs
......
......@@ -392,13 +392,6 @@ Control {
}
}
Widgets.ToolTipExt {
id: plInfoTooltip
delay: 750
colors: root.colors
}
Rectangle {
id: dropIndicator
......
......@@ -34,6 +34,4 @@ IconToolButton {
: colors.blendColors(colors.playerBg, colors.playerControlBarFg, 0.75)
colorFocus: colors.bgFocus
toolTip.colors: colors
}
......@@ -50,7 +50,6 @@ T.ToolButton {
// Aliases
property alias toolTip: toolTip
// active border color
property alias colorFocus: background.activeBorderColor
......@@ -75,11 +74,8 @@ T.ToolButton {
// Childs
Widgets.ToolTipExt {
id: toolTip
text: control.text
delay: 500
}
T.ToolTip.text: control.text
T.ToolTip.delay: VLCStyle.delayToolTipAppear
background: AnimatedBackground {
id: background
......