From 4eb0e117401daaa6a6eca4efd5821ed59aa4f6eb Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 14 Jan 2020 20:44:11 +0100 Subject: [PATCH] Try to match old theme better --- resources/qml/delegates/PlayableMediaMessage.qml | 2 ++ src/timeline/TimelineViewManager.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index ebf7487c..50202098 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -66,6 +66,8 @@ Rectangle { durationText.text = formatTime(new Date(media.duration)) } onValueChanged: updatePositionTexts() + + palette: colors } Text { id: durationText diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index cd2b4a7b..ddbc6af8 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -34,12 +34,12 @@ TimelineViewManager::updateColorPalette() QPalette darkActive(/*windowText*/ QColor("#caccd1"), /*button*/ QColor("#caccd1"), /*light*/ QColor(), - /*dark*/ QColor(45, 49, 57, 120), + /*dark*/ QColor("#202228"), /*mid*/ QColor(), /*text*/ QColor("#caccd1"), /*bright_text*/ QColor(), - /*base*/ QColor("#202228"), - /*window*/ QColor("#202228")); + /*base*/ QColor("#2d3139"), + /*window*/ QColor("#2d3139")); darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9")); view->rootContext()->setContextProperty("currentActivePalette", darkActive); view->rootContext()->setContextProperty("currentInactivePalette", darkActive);