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
462b430d
Commit
462b430d
authored
Nov 21, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix right mouse click behavior on monitor when effect scene is displayed.
Fixes
#1252
parent
026f2109
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/monitor/glwidget.cpp
View file @
462b430d
...
...
@@ -739,7 +739,7 @@ bool GLWidget::checkFrameNumber(int pos, int offset, bool isPlaying)
void
GLWidget
::
mousePressEvent
(
QMouseEvent
*
event
)
{
if
((
rootObject
()
!=
nullptr
)
&&
rootObject
()
->
objectName
()
!=
QLatin1String
(
"root"
)
&&
!
(
event
->
modifiers
()
&
Qt
::
ControlModifier
)
&&
if
((
rootObject
()
!=
nullptr
)
&&
rootObject
()
->
property
(
"captureRightClick"
).
toBool
(
)
&&
!
(
event
->
modifiers
()
&
Qt
::
ControlModifier
)
&&
!
(
event
->
buttons
()
&
Qt
::
MiddleButton
))
{
event
->
ignore
();
QQuickView
::
mousePressEvent
(
event
);
...
...
src/monitor/view/kdenliveclipmonitor.qml
View file @
462b430d
...
...
@@ -23,6 +23,7 @@ Item {
property
double
zoom
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
// Zoombar properties
// The start position of the zoomed area, between 0 and 1
property
double
zoomStart
:
0
...
...
src/monitor/view/kdenlivemonitor.qml
View file @
462b430d
...
...
@@ -21,6 +21,7 @@ Item {
property
double
zoom
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
property
bool
dropped
:
false
property
string
fps
:
'
-
'
property
bool
showMarkers
:
false
...
...
src/monitor/view/kdenlivemonitorcornerscene.qml
View file @
462b430d
...
...
@@ -21,6 +21,7 @@ Item {
property
point
center
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
// Zoombar properties
property
double
zoomStart
:
0
property
double
zoomFactor
:
1
...
...
src/monitor/view/kdenlivemonitoreffectscene.qml
View file @
462b430d
...
...
@@ -22,6 +22,7 @@ Item {
property
point
center
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
// Zoombar properties
property
double
zoomStart
:
0
property
double
zoomFactor
:
1
...
...
@@ -196,7 +197,7 @@ Item {
property
bool
isMoving
:
false
anchors.centerIn
:
root
hoverEnabled
:
true
acceptedButtons
:
Qt
.
LeftButton
|
Qt
.
RightButton
acceptedButtons
:
Qt
.
LeftButton
cursorShape
:
containsMouse
?
Qt
.
PointingHandCursor
:
Qt
.
ArrowCursor
onWheel
:
{
controller
.
seek
(
wheel
.
angleDelta
.
x
+
wheel
.
angleDelta
.
y
,
wheel
.
modifiers
)
...
...
@@ -280,6 +281,7 @@ Item {
property
int
oldMouseX
property
int
oldMouseY
property
double
handleRatio
:
1
acceptedButtons
:
Qt
.
LeftButton
width
:
parent
.
width
;
height
:
parent
.
height
anchors.centerIn
:
parent
hoverEnabled
:
true
...
...
src/monitor/view/kdenlivemonitorrotoscene.qml
View file @
462b430d
...
...
@@ -23,6 +23,7 @@ Item {
property
color
overlayColor
:
'
cyan
'
property
double
scalex
:
1
property
double
scaley
:
1
property
bool
captureRightClick
:
true
// Zoombar properties
property
double
zoomStart
:
0
property
double
zoomFactor
:
1
...
...
src/monitor/view/kdenlivemonitorsplit.qml
View file @
462b430d
...
...
@@ -28,6 +28,7 @@ Item {
property
double
offsety
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
// Zoombar properties
property
double
zoomStart
:
0
property
double
zoomFactor
:
1
...
...
src/monitor/view/kdenlivemonitorsplittracks.qml
View file @
462b430d
...
...
@@ -22,6 +22,7 @@ Item {
property
point
center
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
// Zoombar properties
property
double
zoomStart
:
0
property
double
zoomFactor
:
1
...
...
src/monitor/view/kdenlivemonitortrimming.qml
View file @
462b430d
...
...
@@ -16,6 +16,7 @@ Item {
property
double
zoom
property
double
scalex
property
double
scaley
property
bool
captureRightClick
:
false
property
bool
dropped
:
false
property
string
fps
:
'
-
'
property
bool
showMarkers
:
false
...
...
Write
Preview
Supports
Markdown
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