Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdenlive
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Farid Abdelnour
kdenlive
Commits
d11e0504
Commit
d11e0504
authored
Dec 04, 2015
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix several timeline selection issues (ctrl+click making clip disappear)
parent
6e857357
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
249 additions
and
137 deletions
+249
-137
src/definitions.h
src/definitions.h
+1
-0
src/timeline/abstractclipitem.cpp
src/timeline/abstractclipitem.cpp
+21
-0
src/timeline/abstractclipitem.h
src/timeline/abstractclipitem.h
+2
-0
src/timeline/abstractgroupitem.cpp
src/timeline/abstractgroupitem.cpp
+21
-0
src/timeline/abstractgroupitem.h
src/timeline/abstractgroupitem.h
+2
-0
src/timeline/customtrackview.cpp
src/timeline/customtrackview.cpp
+198
-137
src/timeline/customtrackview.h
src/timeline/customtrackview.h
+4
-0
No files found.
src/definitions.h
View file @
d11e0504
...
...
@@ -56,6 +56,7 @@ const QString stopmotionMonitor("stopmotionMonitor");
enum
OperationType
{
None
=
0
,
WaitingForConfirm
,
MoveOperation
,
ResizeStart
,
ResizeEnd
,
...
...
src/timeline/abstractclipitem.cpp
View file @
d11e0504
...
...
@@ -528,6 +528,27 @@ void AbstractClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
}
}
// virtual
void
AbstractClipItem
::
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
if
(
event
->
modifiers
()
&
Qt
::
ControlModifier
)
{
// User want to do a rectangle selection, so ignore the event to pass it to the view
event
->
ignore
();
}
else
{
QGraphicsItem
::
mouseReleaseEvent
(
event
);
}
}
void
AbstractClipItem
::
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
if
(
event
->
buttons
()
!=
Qt
::
LeftButton
||
event
->
modifiers
()
&
Qt
::
ControlModifier
)
{
// User want to do a rectangle selection, so ignore the event to pass it to the view
event
->
ignore
();
}
else
{
QGraphicsItem
::
mouseMoveEvent
(
event
);
}
}
int
AbstractClipItem
::
itemHeight
()
{
return
0
;
...
...
src/timeline/abstractclipitem.h
View file @
d11e0504
...
...
@@ -131,6 +131,8 @@ protected:
void
drawKeyFrames
(
QPainter
*
painter
,
const
QTransform
&
transformation
);
int
mouseOverKeyFrames
(
QPointF
pos
,
double
maxOffset
);
void
mousePressEvent
(
QGraphicsSceneMouseEvent
*
event
);
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
void
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
);
int
trackForPos
(
int
position
);
int
posForTrack
(
int
track
);
};
...
...
src/timeline/abstractgroupitem.cpp
View file @
d11e0504
...
...
@@ -470,6 +470,27 @@ void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
}
}
// virtual
void
AbstractGroupItem
::
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
if
(
event
->
modifiers
()
&
Qt
::
ControlModifier
)
{
// User want to do a rectangle selection, so ignore the event to pass it to the view
event
->
ignore
();
}
else
{
QGraphicsItem
::
mouseReleaseEvent
(
event
);
}
}
void
AbstractGroupItem
::
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
)
{
if
(
event
->
buttons
()
!=
Qt
::
LeftButton
||
event
->
modifiers
()
&
Qt
::
ControlModifier
)
{
// User want to do a rectangle selection, so ignore the event to pass it to the view
event
->
ignore
();
}
else
{
QGraphicsItem
::
mouseMoveEvent
(
event
);
}
}
void
AbstractGroupItem
::
resizeStart
(
int
diff
)
{
bool
info
=
false
;
...
...
src/timeline/abstractgroupitem.h
View file @
d11e0504
...
...
@@ -68,6 +68,8 @@ protected:
virtual
void
dragLeaveEvent
(
QGraphicsSceneDragDropEvent
*
event
);
virtual
void
dropEvent
(
QGraphicsSceneDragDropEvent
*
event
);
virtual
void
mousePressEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QGraphicsSceneMouseEvent
*
event
);
virtual
void
mouseMoveEvent
(
QGraphicsSceneMouseEvent
*
event
);
int
trackForPos
(
int
position
);
int
posForTrack
(
int
track
);
...
...
src/timeline/customtrackview.cpp
View file @
d11e0504
This diff is collapsed.
Click to expand it.
src/timeline/customtrackview.h
View file @
d11e0504
...
...
@@ -344,7 +344,9 @@ private:
QGraphicsLineItem
*
m_cursorLine
;
ItemInfo
m_dragItemInfo
;
ItemInfo
m_selectionGroupInfo
;
/** @brief Possible timeline action */
OperationType
m_operationMode
;
/** @brief Currently running operation */
OperationType
m_moveOpMode
;
AbstractClipItem
*
m_dragItem
;
Guide
*
m_dragGuide
;
...
...
@@ -505,6 +507,8 @@ private:
void
reloadTimeline
();
/** @brief Make sure our automatic composite transitions are correctly setup. */
void
checkCompositeTransitions
(
Mlt
::
Tractor
*
tractor
);
/** @brief Timeline selection changed, update effect stack. */
void
updateTimelineSelection
();
private
slots
:
void
slotRefreshGuides
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment