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
8079da51
Commit
8079da51
authored
Aug 14, 2010
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: Oops, autoresize (part 2)
this patch completes
07bf40d5
parent
9346f23d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
modules/gui/skins2/parser/builder.cpp
modules/gui/skins2/parser/builder.cpp
+11
-11
No files found.
modules/gui/skins2/parser/builder.cpp
View file @
8079da51
...
...
@@ -1018,16 +1018,6 @@ void Builder::addVideo( const BuilderData::Video &rData )
return
;
}
// Get the visibility variable
// XXX check when it is null
Interpreter
*
pInterpreter
=
Interpreter
::
instance
(
getIntf
()
);
VarBool
*
pVisible
=
pInterpreter
->
getVarBool
(
rData
.
m_visible
,
m_pTheme
);
CtrlVideo
*
pVideo
=
new
CtrlVideo
(
getIntf
(),
*
pLayout
,
rData
.
m_autoResize
,
UString
(
getIntf
(),
rData
.
m_help
.
c_str
()
),
pVisible
);
m_pTheme
->
m_controls
[
rData
.
m_id
]
=
CtrlGenericPtr
(
pVideo
);
BuilderData
::
Video
Data
=
rData
;
if
(
Data
.
m_autoResize
)
{
...
...
@@ -1043,6 +1033,16 @@ void Builder::addVideo( const BuilderData::Video &rData )
}
}
// Get the visibility variable
// XXX check when it is null
Interpreter
*
pInterpreter
=
Interpreter
::
instance
(
getIntf
()
);
VarBool
*
pVisible
=
pInterpreter
->
getVarBool
(
Data
.
m_visible
,
m_pTheme
);
CtrlVideo
*
pVideo
=
new
CtrlVideo
(
getIntf
(),
*
pLayout
,
Data
.
m_autoResize
,
UString
(
getIntf
(),
Data
.
m_help
.
c_str
()
),
pVisible
);
m_pTheme
->
m_controls
[
Data
.
m_id
]
=
CtrlGenericPtr
(
pVideo
);
// Compute the position of the control
const
GenericRect
*
pRect
;
GET_BOX
(
pRect
,
rData
.
m_panelId
,
pLayout
);
...
...
@@ -1052,7 +1052,7 @@ void Builder::addVideo( const BuilderData::Video &rData )
*
pRect
,
Data
.
m_xKeepRatio
,
Data
.
m_yKeepRatio
);
pLayout
->
addControl
(
pVideo
,
pos
,
r
Data
.
m_layer
);
pLayout
->
addControl
(
pVideo
,
pos
,
Data
.
m_layer
);
}
...
...
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