#define SEEK_INACTIVE (-1)
KeyframeHelper::KeyframeHelper(QWidget *parent) :
- QWidget(parent),
- m_geom(NULL),
- m_position(0),
- m_scale(0),
- m_movingKeyframe(false),
- m_lineHeight(9),
- m_drag(false),
- m_hoverKeyframe(-1),
- m_seekPosition(SEEK_INACTIVE)
+ QWidget(parent)
+ , frameLength(1)
+ , m_geom(NULL)
+ , m_position(0)
+ , m_scale(0)
+ , m_movingKeyframe(false)
+ , m_movingItem()
+ , m_lineHeight(9)
+ , m_drag(false)
+ , m_hoverKeyframe(-1)
+ , m_seekPosition(SEEK_INACTIVE)
{
setFont(KGlobalSettings::toolBarFont());
setMouseTracking(true);
while (!m_extraMovingItems.isEmpty()) {
Mlt::GeometryItem *gitem = m_extraMovingItems.takeFirst();
- delete gitem;
+ if (gitem) delete gitem;
}
for (int i = 0; i < m_extraGeometries.count(); i++) {
- Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
if (m_extraGeometries.at(i)->next_key(item, mousePos) == 0) {
+ Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
item2->x(item.x());
item2->frame(item.frame());
m_extraMovingItems.append(item2);
} else {
- delete(item2);
+ m_extraMovingItems.append(NULL);
}
}
}
}
if (event->y() >= m_lineHeight && event->y() < height()) {
- m_drag = true;
- m_seekPosition = xPos / m_scale;
- emit requestSeek(m_seekPosition);
- update();
+ int seekRequest = xPos / m_scale;
+ m_drag = true;
+ if (seekRequest != m_position) {
+ m_seekPosition = seekRequest;
+ emit requestSeek(m_seekPosition);
+ update();
+ }
}
}
if (KdenliveSettings::snaptopoints() && qAbs(pos - m_position) < 5) pos = m_position;
m_movingItem.frame(pos);
for (int i = 0; i < m_extraMovingItems.count(); i++) {
- m_extraMovingItems[i]->frame(pos);
+ if (m_extraMovingItems.at(i)) m_extraMovingItems[i]->frame(pos);
}
update();
return;
m_movingKeyframe = false;
for (int i = 0; i < m_extraGeometries.count(); i++) {
- m_extraGeometries[i]->insert(m_extraMovingItems.at(i));
+ if (m_extraMovingItems.at(i)) m_extraGeometries[i]->insert(m_extraMovingItems.at(i));
}
emit keyframeMoved(m_position);
p.setPen(palette().dark().color());
p.drawLine(margin, m_lineHeight, width() - margin - 1, m_lineHeight);
p.drawLine(margin, m_lineHeight - 3, margin, m_lineHeight + 3);
- p.drawLine(width() - margin - 1, m_lineHeight - 3, width() - margin - 1, m_lineHeight + 3);
+ p.drawLine(width() - margin, m_lineHeight - 3, width() - margin, m_lineHeight + 3);
// draw pointer
if (m_seekPosition != SEEK_INACTIVE) {
void KeyframeHelper::setKeyGeometry(Mlt::Geometry *geom, const int length)
{
m_geom = geom;
- frameLength = length;
- while (!m_extraGeometries.isEmpty()) {
- Mlt::Geometry *geom = m_extraGeometries.takeFirst();
- delete geom;
- }
+ frameLength = qMax(1, length);
update();
}