Commit a20e59c5 authored by Vincent Pinon's avatar Vincent Pinon
Browse files

switch group & selection color

parent d201971f
......@@ -159,7 +159,7 @@ Rectangle {
labelRect.x = scrollX > modelStart * timeScale ? scrollX - modelStart * timeScale : 0
}
border.color: selected? activePalette.highlight : grouped ? root.groupColor : borderColor
border.color: selected ? root.selectionColor : grouped ? root.groupColor : borderColor
border.width: isGrabbed ? 8 : 1.5
function updateDrag() {
......
......@@ -185,6 +185,7 @@ Rectangle {
property color audioColor: timeline.audioColor
property color videoColor: timeline.videoColor
property color lockedColor: timeline.lockedColor
property color selectionColor: timeline.selectionColor
property color groupColor: timeline.groupColor
property int clipBeingDroppedId: -1
property string clipBeingDroppedData
......
......@@ -2148,6 +2148,12 @@ QColor TimelineController::lockedColor() const
}
QColor TimelineController::groupColor() const
{
KColorScheme scheme(QApplication::palette().currentColorGroup());
return scheme.foreground(KColorScheme::ActiveText).color();
}
QColor TimelineController::selectionColor() const
{
KColorScheme scheme(QApplication::palette().currentColorGroup(), KColorScheme::Complementary);
return scheme.foreground(KColorScheme::NeutralText).color();
......
......@@ -70,6 +70,7 @@ class TimelineController : public QObject
Q_PROPERTY(QColor videoColor READ videoColor NOTIFY colorsChanged)
Q_PROPERTY(QColor audioColor READ audioColor NOTIFY colorsChanged)
Q_PROPERTY(QColor lockedColor READ lockedColor NOTIFY colorsChanged)
Q_PROPERTY(QColor selectionColor READ selectionColor NOTIFY colorsChanged)
Q_PROPERTY(QColor groupColor READ groupColor NOTIFY colorsChanged)
public:
......@@ -142,6 +143,7 @@ public:
Q_INVOKABLE QColor videoColor() const;
Q_INVOKABLE QColor audioColor() const;
Q_INVOKABLE QColor lockedColor() const;
Q_INVOKABLE QColor selectionColor() const;
Q_INVOKABLE QColor groupColor() const;
/* @brief Request a seek operation
@param position is the desired new timeline position
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment