Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
977910db
Commit
977910db
authored
Oct 15, 2008
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Calculate fullscreencotnrollers position only when screen has changed
parent
9a51f390
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
20 deletions
+28
-20
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+27
-20
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 @
977910db
...
@@ -769,6 +769,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i )
...
@@ -769,6 +769,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i )
b_fullscreen
=
false
;
b_fullscreen
=
false
;
i_hide_timeout
=
1
;
i_hide_timeout
=
1
;
p_vout
=
NULL
;
p_vout
=
NULL
;
i_screennumber
=
-
1
;
setWindowFlags
(
Qt
::
ToolTip
);
setWindowFlags
(
Qt
::
ToolTip
);
setMinimumWidth
(
600
);
setMinimumWidth
(
600
);
...
@@ -845,6 +846,11 @@ void FullscreenControllerWidget::showFSC()
...
@@ -845,6 +846,11 @@ void FullscreenControllerWidget::showFSC()
adjustSize
();
adjustSize
();
/* center down */
/* center down */
int
number
=
QApplication
::
desktop
()
->
screenNumber
(
p_intf
->
p_sys
->
p_mi
);
int
number
=
QApplication
::
desktop
()
->
screenNumber
(
p_intf
->
p_sys
->
p_mi
);
if
(
number
!=
i_screennumber
)
{
msg_Dbg
(
p_intf
,
"Calculation fullscreen controllers center"
);
/* screen has changed, calculate new position */
i_screennumber
=
number
;
int
totalCount
=
QApplication
::
desktop
()
->
numScreens
();
int
totalCount
=
QApplication
::
desktop
()
->
numScreens
();
QRect
screenRes
=
QApplication
::
desktop
()
->
screenGeometry
(
number
);
QRect
screenRes
=
QApplication
::
desktop
()
->
screenGeometry
(
number
);
int
offset_x
=
0
;
int
offset_x
=
0
;
...
@@ -867,6 +873,7 @@ void FullscreenControllerWidget::showFSC()
...
@@ -867,6 +873,7 @@ void FullscreenControllerWidget::showFSC()
QPoint
pos
=
QPoint
(
offset_x
+
(
screenRes
.
width
()
/
2
)
-
(
width
()
/
2
),
QPoint
pos
=
QPoint
(
offset_x
+
(
screenRes
.
width
()
/
2
)
-
(
width
()
/
2
),
offset_y
+
screenRes
.
height
()
-
height
());
offset_y
+
screenRes
.
height
()
-
height
());
move
(
pos
);
move
(
pos
);
}
#ifdef WIN32TRICK
#ifdef WIN32TRICK
// after quiting and going to fs, we need to call show()
// after quiting and going to fs, we need to call show()
if
(
isHidden
()
)
if
(
isHidden
()
)
...
...
modules/gui/qt4/components/controller.hpp
View file @
977910db
...
@@ -286,6 +286,7 @@ private:
...
@@ -286,6 +286,7 @@ private:
int
i_mouse_last_x
,
i_mouse_last_y
;
int
i_mouse_last_x
,
i_mouse_last_y
;
bool
b_mouse_over
;
bool
b_mouse_over
;
int
i_screennumber
;
#ifdef WIN32TRICK
#ifdef WIN32TRICK
bool
b_fscHidden
;
bool
b_fscHidden
;
...
...
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