Fix clip monitor audio overlay, make monitor ruler slightly larger

CCBUG: 414617
parent 76582a05
......@@ -66,7 +66,7 @@ GLWidget::GLWidget(int id, QObject *parent)
, m_consumer(nullptr)
, m_producer(nullptr)
, m_id(id)
, m_rulerHeight(QFontMetrics(QApplication::font()).lineSpacing() * 0.7)
, m_rulerHeight(QFontMetrics(QApplication::font()).lineSpacing() * 0.9)
, m_bgColor(KdenliveSettings::window_background())
, m_shader(nullptr)
, m_initSem(0)
......
......@@ -7,8 +7,13 @@ import QtQuick 2.4
// Monitor ruler
Rectangle {
id: ruler
color: activePalette.window
color: activePalette.base
property bool containsMouse: rulerMouseArea.containsMouse
Rectangle {
color: activePalette.light
width: parent.width
height: 1
}
Timer {
id: zoneToolTipTimer
......@@ -16,7 +21,7 @@ Rectangle {
}
function forceRepaint()
{
ruler.color = activePalette.window
ruler.color = activePalette.base
// Enforce repaint
rulerTicks.model = 0
rulerTicks.model = ruler.width / frameSize + 2
......
......@@ -141,9 +141,9 @@ Item {
visible: root.showAudiothumb && (isAudioClip || controller.clipType == ProducerType.AV)
states: [
State { when: audioThumb.stateVisible || isAudioClip;
State { when: audioThumb.stateVisible || audioThumb.isAudioClip;
PropertyChanges { target: audioThumb; opacity: 1.0 } },
State { when: !audioThumb.stateVisible && isAudioClip;
State { when: !audioThumb.stateVisible && !audioThumb.isAudioClip;
PropertyChanges { target: audioThumb; opacity: 0.0 } }
]
transitions: [ Transition {
......
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