Some small fixes for effect compare (monitor split)

parent e62ae894
......@@ -1756,7 +1756,9 @@ void Monitor::warningMessage(const QString &text, int timeout, const QList<QActi
void Monitor::activateSplit()
{
loadQmlScene(MonitorSceneSplit);
if (slotActivateMonitor()) {
if (isActive()) {
m_glMonitor->requestRefresh();
} else if (slotActivateMonitor()) {
start();
}
}
......@@ -1787,7 +1789,9 @@ void Monitor::slotSwitchCompare(bool enable)
delete m_splitEffect;
m_splitEffect = nullptr;
loadQmlScene(MonitorSceneDefault);
if (slotActivateMonitor()) {
if (isActive()) {
m_glMonitor->requestRefresh();
} else if (slotActivateMonitor()) {
start();
}
......
......@@ -5,10 +5,15 @@ import QtQuick.Controls.Styles 1.3
Item {
id: root
objectName: "rootsplit"
SystemPalette { id: activePalette }
// default size, but scalable by user
height: 300; width: 400
signal qmlMoveSplit()
property double timeScale: 1
property double frameSize: 10
property int duration: 300
property bool mouseOverRuler: false
property int mouseRulerPos: 0
property int splitterPos
property point center
// percentage holds splitter pos relative to the scene percentage
......@@ -16,6 +21,8 @@ Item {
// realpercent holds splitter pos relative to the frame width percentage
property double realpercent
signal qmlMoveSplit()
percentage: 0.5
realpercent: 0.5
splitterPos: this.width / 2
......@@ -63,6 +70,15 @@ Item {
}
}
}
MonitorRuler {
id: clipMonitorRuler
anchors {
left: root.left
right: root.right
bottom: root.bottom
}
height: controller.rulerHeight
}
Timer {
id: timer
......
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