Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
e2c1890d
Commit
e2c1890d
authored
Apr 26, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: FSC, don't move if you clicked on a button (and not the plain controller )
Close #2429 and #2460.
parent
bf171654
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+11
-1
modules/gui/qt4/components/controller.hpp
modules/gui/qt4/components/controller.hpp
+1
-0
No files found.
modules/gui/qt4/components/controller.cpp
View file @
e2c1890d
...
@@ -910,8 +910,11 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
...
@@ -910,8 +910,11 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
*/
*/
void
FullscreenControllerWidget
::
mouseMoveEvent
(
QMouseEvent
*
event
)
void
FullscreenControllerWidget
::
mouseMoveEvent
(
QMouseEvent
*
event
)
{
{
if
(
event
->
buttons
()
==
Qt
::
LeftButton
)
if
(
event
->
buttons
()
==
Qt
::
LeftButton
)
{
{
if
(
i_mouse_last_x
==
-
1
||
i_mouse_last_y
==
-
1
)
return
;
int
i_moveX
=
event
->
globalX
()
-
i_mouse_last_x
;
int
i_moveX
=
event
->
globalX
()
-
i_mouse_last_x
;
int
i_moveY
=
event
->
globalY
()
-
i_mouse_last_y
;
int
i_moveY
=
event
->
globalY
()
-
i_mouse_last_y
;
...
@@ -932,6 +935,12 @@ void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event )
...
@@ -932,6 +935,12 @@ void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event )
i_mouse_last_y
=
event
->
globalY
();
i_mouse_last_y
=
event
->
globalY
();
}
}
void
FullscreenControllerWidget
::
mouseReleaseEvent
(
QMouseEvent
*
event
)
{
i_mouse_last_x
=
-
1
;
i_mouse_last_y
=
-
1
;
}
/**
/**
* On mouse go above FSC
* On mouse go above FSC
*/
*/
...
@@ -1095,6 +1104,7 @@ void FullscreenControllerWidget::fullscreenChanged( vout_thread_t *p_vout,
...
@@ -1095,6 +1104,7 @@ void FullscreenControllerWidget::fullscreenChanged( vout_thread_t *p_vout,
}
}
vlc_mutex_unlock
(
&
lock
);
vlc_mutex_unlock
(
&
lock
);
}
}
/**
/**
* Mouse change callback (show/hide the controller on mouse movement)
* Mouse change callback (show/hide the controller on mouse movement)
*/
*/
...
...
modules/gui/qt4/components/controller.hpp
View file @
e2c1890d
...
@@ -244,6 +244,7 @@ protected:
...
@@ -244,6 +244,7 @@ protected:
virtual
void
mouseMoveEvent
(
QMouseEvent
*
event
);
virtual
void
mouseMoveEvent
(
QMouseEvent
*
event
);
virtual
void
mousePressEvent
(
QMouseEvent
*
event
);
virtual
void
mousePressEvent
(
QMouseEvent
*
event
);
virtual
void
mouseReleaseEvent
(
QMouseEvent
*
event
);
virtual
void
enterEvent
(
QEvent
*
event
);
virtual
void
enterEvent
(
QEvent
*
event
);
virtual
void
leaveEvent
(
QEvent
*
event
);
virtual
void
leaveEvent
(
QEvent
*
event
);
virtual
void
keyPressEvent
(
QKeyEvent
*
event
);
virtual
void
keyPressEvent
(
QKeyEvent
*
event
);
...
...
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