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 (6)
Showing
with 89 additions and 41 deletions
......@@ -116,7 +116,7 @@ T.ItemDelegate {
onDoubleClicked: itemDoubleClicked(mouse)
Widgets.CurrentIndicator {
height: parent.height - (margin * 2)
length: parent.height - (margin * 2)
margin: VLCStyle.dp(4, VLCStyle.scale)
......
......@@ -44,11 +44,11 @@ T.ItemDelegate {
// Settings
topPadding: VLCStyle.margin_xxsmall
topPadding: VLCStyle.playlistDelegate_verticalPadding
bottomPadding: VLCStyle.margin_xxsmall
bottomPadding: VLCStyle.playlistDelegate_verticalPadding
leftPadding: VLCStyle.margin_normal
leftPadding: VLCStyle.margin_xxsmall
rightPadding: Math.max(listView.scrollBarWidth, VLCStyle.margin_normal)
......@@ -112,12 +112,34 @@ T.ItemDelegate {
contentItem: RowLayout {
spacing: 0
Widgets.CurrentIndicator {
id: currentIndicator
// disable positioning via CurrentIndicator, manually position according to RowLayout
source: null
implicitWidth: VLCStyle.heightBar_xxxsmall
Layout.fillHeight: true
color: {
if (model.isCurrent)
return theme.accent
// based on design, ColorContext can't handle this case
if (!delegate.hovered)
return VLCStyle.setColorAlpha(theme.indicator, 0)
return theme.indicator
}
}
Item {
id: artworkItem
Layout.preferredHeight: VLCStyle.icon_normal
Layout.preferredWidth: VLCStyle.icon_normal
Layout.preferredHeight: VLCStyle.icon_playlistArt
Layout.preferredWidth: VLCStyle.icon_playlistArt
Layout.alignment: Qt.AlignVCenter
Layout.leftMargin: VLCStyle.margin_xsmall
Accessible.role: Accessible.Graphic
Accessible.name: I18n.qtr("Cover")
......@@ -178,7 +200,7 @@ T.ItemDelegate {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.leftMargin: VLCStyle.margin_large
spacing: 0
spacing: VLCStyle.margin_xsmall
Widgets.ListLabel {
id: textInfo
......@@ -198,7 +220,6 @@ T.ItemDelegate {
Layout.fillHeight: true
Layout.fillWidth: true
font.weight: model.isCurrent ? Font.DemiBold : Font.Normal
text: (model.artist ? model.artist : I18n.qtr("Unknown Artist"))
color: theme.fg.primary
verticalAlignment: Text.AlignBottom
......
......@@ -238,7 +238,8 @@ Control {
spacing: VLCStyle.margin_large
Widgets.IconLabel {
Layout.preferredWidth: VLCStyle.icon_playlistHeader
// playlist cover column
Layout.preferredWidth: VLCStyle.icon_playlistArt
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
......
......@@ -114,6 +114,7 @@ QtObject {
readonly property int icon_actionButton: icon_normal
readonly property int icon_PIP: icon_normal
readonly property int icon_CSD: icon_small
readonly property int icon_playlistArt: dp(32, scale)
readonly property int play_cover_small: dp(24, scale)
readonly property int play_cover_normal: dp(48, scale)
......@@ -222,6 +223,8 @@ QtObject {
readonly property int artistBanner_height: dp(200, scale)
readonly property int playlistDelegate_verticalPadding: dp(6, scale)
//global application size, updated by the root widget
property int appWidth: 0
property int appHeight: 0
......
......@@ -402,6 +402,11 @@ QColor ColorContext::separator() const
return getColor(Decoration, Separator);
}
QColor ColorContext::indicator() const
{
return getColor(Decoration, Indicator);
}
QColor ColorContext::shadow() const
{
return getColor(Decoration, Shadow);
......
......@@ -117,6 +117,7 @@ public:
Accent = VQTC_NAME_ACCENT,
Shadow = VQTC_NAME_SHADOW,
Separator = VQTC_NAME_SEPARATOR,
Indicator = VQTC_NAME_INDICATOR
};
Q_PROPERTY(SystemPalette* palette READ palette WRITE setPalette NOTIFY paletteChanged FINAL)
......@@ -139,6 +140,7 @@ public:
Q_PROPERTY(QColor visualFocus READ visualFocus NOTIFY colorsChanged FINAL)
Q_PROPERTY(QColor border READ border NOTIFY colorsChanged FINAL)
Q_PROPERTY(QColor separator READ separator NOTIFY colorsChanged FINAL)
Q_PROPERTY(QColor indicator READ indicator NOTIFY colorsChanged FINAL)
Q_PROPERTY(QColor shadow READ shadow NOTIFY colorsChanged FINAL)
Q_PROPERTY(QColor accent READ accent NOTIFY colorsChanged FINAL)
......@@ -160,6 +162,7 @@ public:
QColor visualFocus() const;
QColor border() const;
QColor separator() const;
QColor indicator() const;
QColor shadow() const;
QColor accent() const;
......
......@@ -359,6 +359,9 @@ static int updatePalette(vlc_qt_theme_provider_t* obj)
setGtkColorSetFg(obj, CS, VQTC_NAME_PRIMARY, ITEM_SELECTOR);
setGtkColorSetBorder(obj, CS, ITEM_SELECTOR);
setGtkColorSetHighlight(obj, CS, ITEM_SELECTOR);
const auto separator = GetSeparatorColor(" GtkListBoxRow#separator.horizontal");
setGtkColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_INDICATOR, VQTC_STATE_NORMAL, separator);
}
#define COMBOBOX_SELECTOR VIEW_SELECTOR " GtkComboBoxText#combobox #box.linked #entry.combo"
......
......@@ -74,6 +74,7 @@ enum vlc_qt_theme_color_name {
VQTC_NAME_ACCENT,
VQTC_NAME_SHADOW,
VQTC_NAME_SEPARATOR,
VQTC_NAME_INDICATOR,
VQTC_NAME_COUNT
};
......
......@@ -561,6 +561,9 @@ void SystemPalette::makeLightPalette()
setColor(CS, C::Fg, C::Primary, C::Normal, Qt::black);
setColor(CS, C::Fg, C::Secondary, C::Normal, setColorAlpha(Qt::black, 0.6));
setColor(CS, C::Decoration, C::Indicator, C::Normal, QColor("#9e9e9e")); //FIXME not a predef
}
//Accent Buttons
......@@ -755,6 +758,8 @@ void SystemPalette::makeDarkPalette()
setColor(CS, C::Fg, C::Primary, C::Normal, Qt::white);
setColor(CS, C::Fg, C::Secondary, C::Normal, setColorAlpha(Qt::white, 0.6));
setColor(CS, C::Decoration, C::Indicator, C::Normal, QColor("#666666")); //FIXME not a predef
}
//Accent Buttons
......
......@@ -327,6 +327,13 @@ static int updatePalette(vlc_qt_theme_provider_t* obj)
setQtColor(obj, CS, VQTC_SECTION_BG, VQTC_NAME_HIGHLIGHT, VQTC_STATE_FOCUSED, hightlightHover);
setQtColor(obj, CS, VQTC_SECTION_BG, VQTC_NAME_HIGHLIGHT, VQTC_STATE_HOVERED, hightlightHover);
setQtColor(obj, CS, VQTC_SECTION_FG, VQTC_NAME_HIGHLIGHT, VQTC_STATE_NORMAL, textOnHightlight);
const auto bg = palette.color(QPalette::AlternateBase);
const auto indicator = sys->m_isDark ? bg.lighter() : bg.darker();
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_INDICATOR
, VQTC_STATE_NORMAL, indicator);
}
//Badge
......
......@@ -171,6 +171,8 @@ static int updatePalette(vlc_qt_theme_provider_t* obj)
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_NORMAL, COLOR_BTNTEXT);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_FOCUSED, COLOR_HIGHLIGHT);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_BORDER, VQTC_STATE_HOVERED, COLOR_HIGHLIGHT);
setQtColor(obj, CS, VQTC_SECTION_DECORATION, VQTC_NAME_INDICATOR, VQTC_STATE_NORMAL, COLOR_HIGHLIGHT);
}
//set colors on all buttons
......
......@@ -130,7 +130,7 @@ T.TabButton {
}
Widgets.CurrentIndicator {
width: tabRow.width
length: tabRow.width
orientation: Qt.Horizontal
......
......@@ -23,6 +23,7 @@ import org.videolan.vlc 0.1
import "qrc:///style/"
Rectangle {
id: root
property int orientation: Qt.Vertical
property int margin: VLCStyle.margin_xxxsmall
......@@ -31,37 +32,33 @@ Rectangle {
id: theme
}
color: theme.accent
width: orientation === Qt.Vertical ? VLCStyle.heightBar_xxxsmall : parent.width
height: orientation === Qt.Horizontal ? VLCStyle.heightBar_xxxsmall : parent.height
property Item source: parent
property int length: 0
onOrientationChanged: {
if (orientation == Qt.Vertical) {
anchors.horizontalCenter = undefined
anchors.verticalCenter = Qt.binding(function () {
return parent.verticalCenter
})
anchors.left = Qt.binding(function () {
return parent.left
})
anchors.right = undefined
anchors.leftMargin = Qt.binding(function () {
return margin
})
anchors.bottomMargin = 0
} else {
anchors.top = undefined
anchors.bottom = Qt.binding(function () {
return parent.bottom
})
anchors.horizontalCenter = Qt.binding(function () {
return parent.horizontalCenter
})
anchors.verticalCenter = undefined
anchors.leftMargin = 0
anchors.bottomMargin = Qt.binding(function () {
return margin
})
property var _position: [
{
// for orientation == Qt.Vertical
"width" : VLCStyle.heightBar_xxxsmall,
"height": root.length,
"x": margin,
"y": !!source ? (source.height - root.length) / 2 : 0
},
{
// for orientation == Qt.Horizontal
"width": root.length,
"height": VLCStyle.heightBar_xxxsmall,
"x": !!source ? (source.width - root.length) / 2 : 0,
"y": !!source ? source.height - margin : 0,
}
}
]
property var _currentPosition: (orientation === Qt.Vertical) ? _position[0] : _position[1]
color: theme.accent
x: _currentPosition.x
y: _currentPosition.y
width: _currentPosition.width
height: _currentPosition.height
}