Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
f6482bd6
Commit
f6482bd6
authored
Apr 30, 2006
by
Cyril Deguet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* generic_layout.cpp: don't draw controls of an invisible layout
parent
dc90d448
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
modules/gui/skins2/src/generic_layout.cpp
modules/gui/skins2/src/generic_layout.cpp
+10
-1
modules/gui/skins2/src/generic_layout.hpp
modules/gui/skins2/src/generic_layout.hpp
+2
-0
No files found.
modules/gui/skins2/src/generic_layout.cpp
View file @
f6482bd6
...
@@ -35,7 +35,8 @@ GenericLayout::GenericLayout( intf_thread_t *pIntf, int width, int height,
...
@@ -35,7 +35,8 @@ GenericLayout::GenericLayout( intf_thread_t *pIntf, int width, int height,
int
maxHeight
)
:
int
maxHeight
)
:
SkinObject
(
pIntf
),
m_pWindow
(
NULL
),
m_width
(
width
),
SkinObject
(
pIntf
),
m_pWindow
(
NULL
),
m_width
(
width
),
m_height
(
height
),
m_minWidth
(
minWidth
),
m_maxWidth
(
maxWidth
),
m_height
(
height
),
m_minWidth
(
minWidth
),
m_maxWidth
(
maxWidth
),
m_minHeight
(
minHeight
),
m_maxHeight
(
maxHeight
),
m_pVideoControl
(
NULL
)
m_minHeight
(
minHeight
),
m_maxHeight
(
maxHeight
),
m_pVideoControl
(
NULL
),
m_visible
(
false
)
{
{
// Get the OSFactory
// Get the OSFactory
OSFactory
*
pOsFactory
=
OSFactory
::
instance
(
getIntf
()
);
OSFactory
*
pOsFactory
=
OSFactory
::
instance
(
getIntf
()
);
...
@@ -222,6 +223,10 @@ void GenericLayout::refreshAll()
...
@@ -222,6 +223,10 @@ void GenericLayout::refreshAll()
void
GenericLayout
::
refreshRect
(
int
x
,
int
y
,
int
width
,
int
height
)
void
GenericLayout
::
refreshRect
(
int
x
,
int
y
,
int
width
,
int
height
)
{
{
// Do nothing if the layout is hidden
if
(
!
m_visible
)
return
;
// Draw all the controls of the layout
// Draw all the controls of the layout
list
<
LayeredControl
>::
const_iterator
iter
;
list
<
LayeredControl
>::
const_iterator
iter
;
list
<
LayeredControl
>::
const_iterator
iterVideo
=
m_controlList
.
end
();
list
<
LayeredControl
>::
const_iterator
iterVideo
=
m_controlList
.
end
();
...
@@ -301,6 +306,8 @@ void GenericLayout::addAnchor( Anchor *pAnchor )
...
@@ -301,6 +306,8 @@ void GenericLayout::addAnchor( Anchor *pAnchor )
void
GenericLayout
::
onShow
()
void
GenericLayout
::
onShow
()
{
{
m_visible
=
true
;
refreshAll
();
refreshAll
();
// TODO find a better way to handle the vout ?
// TODO find a better way to handle the vout ?
if
(
m_pVideoControl
)
if
(
m_pVideoControl
)
...
@@ -312,6 +319,8 @@ void GenericLayout::onShow()
...
@@ -312,6 +319,8 @@ void GenericLayout::onShow()
void
GenericLayout
::
onHide
()
void
GenericLayout
::
onHide
()
{
{
m_visible
=
false
;
// TODO find a better way to handle the vout ?
// TODO find a better way to handle the vout ?
if
(
m_pVideoControl
)
if
(
m_pVideoControl
)
{
{
...
...
modules/gui/skins2/src/generic_layout.hpp
View file @
f6482bd6
...
@@ -143,6 +143,8 @@ class GenericLayout: public SkinObject, public Box
...
@@ -143,6 +143,8 @@ class GenericLayout: public SkinObject, public Box
CtrlVideo
*
m_pVideoControl
;
CtrlVideo
*
m_pVideoControl
;
/// List of the anchors in the layout
/// List of the anchors in the layout
list
<
Anchor
*>
m_anchorList
;
list
<
Anchor
*>
m_anchorList
;
/// Flag to know if the layout is visible
bool
m_visible
;
};
};
...
...
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