From d35cc3dda4dc08dd16d9d12d5f96863d831fd6c7 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 28 Mar 2020 19:12:00 +0100 Subject: Use palette for qml code for theming Can't do it for QtWidgets code. We need to fully transition, before we can fully switch over probably. --- src/timeline/TimelineViewManager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/timeline/TimelineViewManager.cpp') diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index eead46a2..634ff4d6 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -34,6 +34,7 @@ TimelineViewManager::updateColorPalette() lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color()); lightActive.setColor(QPalette::ToolTipText, lightActive.text().color()); lightActive.setColor(QPalette::Link, QColor("#0077b5")); + lightActive.setColor(QPalette::ButtonText, QColor("gray")); view->rootContext()->setContextProperty("currentActivePalette", lightActive); view->rootContext()->setContextProperty("currentInactivePalette", lightActive); } else if (settings->theme() == "dark") { @@ -43,13 +44,14 @@ TimelineViewManager::updateColorPalette() /*dark*/ QColor("#2d3139"), /*mid*/ QColor(), /*text*/ QColor("#caccd1"), - /*bright_text*/ QColor(), + /*bright_text*/ QColor(0xff, 0xff, 0xff), /*base*/ QColor("#2d3139"), /*window*/ QColor("#202228")); darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9")); darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color()); darkActive.setColor(QPalette::ToolTipText, darkActive.text().color()); darkActive.setColor(QPalette::Link, QColor("#38a3d8")); + darkActive.setColor(QPalette::ButtonText, QColor("gray")); view->rootContext()->setContextProperty("currentActivePalette", darkActive); view->rootContext()->setContextProperty("currentInactivePalette", darkActive); } else { -- cgit 1.5.1