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
834bd870
Commit
834bd870
authored
Sep 20, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: Fight against Windows FS controller, one more round.
parent
af5da01c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
9 deletions
+46
-9
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+43
-9
modules/gui/qt4/components/interface_widgets.hpp
modules/gui/qt4/components/interface_widgets.hpp
+3
-0
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
834bd870
...
...
@@ -1021,6 +1021,9 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
b_slow_hide_begin
(
false
),
i_slow_hide_timeout
(
1
),
b_fullscreen
(
false
),
i_hide_timeout
(
1
),
p_vout
(
NULL
)
{
i_mouse_last_move_x
=
-
1
;
i_mouse_last_move_y
=
-
1
;
setWindowFlags
(
Qt
::
ToolTip
);
setFrameShape
(
QFrame
::
StyledPanel
);
...
...
@@ -1191,9 +1194,7 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
{
bool
b_fs
;
#ifndef NDEBUG
msg_Dbg
(
p_intf
,
"New FSC event: %i"
,
event
->
type
()
);
#endif
switch
(
event
->
type
()
)
{
...
...
@@ -1325,7 +1326,39 @@ static int FullscreenControllerWidgetMouseMoved( vlc_object_t *vlc_object, const
{
FullscreenControllerWidget
*
p_fs
=
(
FullscreenControllerWidget
*
)
data
;
msg_Dbg
(
p_fs
->
p_vout
,
"Qt4: The mouse has moved"
);
int
i_mousex
,
i_mousey
;
bool
b_toShow
=
false
;
/* Get the value from the Vout - Trust the vout more than Qt */
i_mousex
=
var_GetInteger
(
p_fs
->
p_vout
,
"mouse-x"
);
i_mousey
=
var_GetInteger
(
p_fs
->
p_vout
,
"mouse-y"
);
msg_Dbg
(
p_fs
->
p_vout
,
"Qt4: The mouse has moved: %i %i"
,
i_mousex
,
i_mousey
);
/* First time */
if
(
p_fs
->
i_mouse_last_move_x
==
-
1
||
p_fs
->
i_mouse_last_move_y
==
-
1
)
{
p_fs
->
i_mouse_last_move_x
=
i_mousex
;
p_fs
->
i_mouse_last_move_y
=
i_mousey
;
b_toShow
=
true
;
}
/* All other times */
else
{
msg_Dbg
(
p_fs
->
p_vout
,
"%i %i"
,
abs
(
p_fs
->
i_mouse_last_move_x
-
i_mousex
),
abs
(
p_fs
->
i_mouse_last_move_y
-
i_mousey
)
);
if
(
abs
(
p_fs
->
i_mouse_last_move_x
-
i_mousex
)
>
1
||
abs
(
p_fs
->
i_mouse_last_move_y
-
i_mousey
)
>
1
)
{
b_toShow
=
true
;
p_fs
->
i_mouse_last_move_x
=
i_mousex
;
p_fs
->
i_mouse_last_move_y
=
i_mousey
;
}
}
if
(
b_toShow
)
{
/* Show event */
IMEvent
*
eShow
=
new
IMEvent
(
FullscreenControlShow_Type
,
0
);
QApplication
::
postEvent
(
p_fs
,
static_cast
<
QEvent
*>
(
eShow
)
);
...
...
@@ -1333,6 +1366,7 @@ static int FullscreenControllerWidgetMouseMoved( vlc_object_t *vlc_object, const
/* Plan hide event */
IMEvent
*
eHide
=
new
IMEvent
(
FullscreenControlPlanHide_Type
,
0
);
QApplication
::
postEvent
(
p_fs
,
static_cast
<
QEvent
*>
(
eHide
)
);
}
return
VLC_SUCCESS
;
}
...
...
modules/gui/qt4/components/interface_widgets.hpp
View file @
834bd870
...
...
@@ -254,6 +254,9 @@ public:
void
fullscreenChanged
(
vout_thread_t
*
,
bool
b_fs
,
int
i_timeout
);
vout_thread_t
*
p_vout
;
int
i_mouse_last_move_x
;
int
i_mouse_last_move_y
;
protected:
friend
class
MainInterface
;
friend
class
VolumeClickHandler
;
...
...
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