Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
ad7cbbb9
Commit
ad7cbbb9
authored
Aug 05, 2021
by
Jean-Baptiste Mardelle
Browse files
Don't allow deleting items when a spacer move operation is running.
BUG: 408434
parent
5b179bed
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/timeline.qml
View file @
ad7cbbb9
...
...
@@ -13,7 +13,7 @@ Rectangle {
property
bool
validMenu
:
false
property
color
textColor
:
activePalette
.
text
property
var
groupTrimData
property
bool
dragInProgress
:
dragProxyArea
.
pressed
||
dragProxyArea
.
drag
.
active
||
groupTrimData
!==
undefined
property
bool
dragInProgress
:
dragProxyArea
.
pressed
||
dragProxyArea
.
drag
.
active
||
groupTrimData
!==
undefined
||
spacerGroup
>
-
1
signal
clipClicked
()
signal
mousePosChanged
(
int
position
)
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
ad7cbbb9
...
...
@@ -501,6 +501,11 @@ int TimelineController::insertComposition(int tid, int position, const QString &
void
TimelineController
::
deleteSelectedClips
()
{
if
(
dragOperationRunning
())
{
// Don't allow timeline operation while drag in progress
pCore
->
displayMessage
(
i18n
(
"Cannot perform operation while dragging in timeline"
),
ErrorMessage
);
return
;
}
auto
sel
=
m_model
->
getCurrentSelection
();
if
(
sel
.
empty
())
{
// Check if a mix is selected
...
...
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