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
4166f7e8
Commit
4166f7e8
authored
Apr 06, 2013
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: reuse graphics from generic bitmap cache (radialslider)
parent
91cbdf85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
14 deletions
+5
-14
modules/gui/skins2/controls/ctrl_radialslider.cpp
modules/gui/skins2/controls/ctrl_radialslider.cpp
+4
-11
modules/gui/skins2/controls/ctrl_radialslider.hpp
modules/gui/skins2/controls/ctrl_radialslider.hpp
+1
-3
No files found.
modules/gui/skins2/controls/ctrl_radialslider.cpp
View file @
4166f7e8
...
@@ -40,17 +40,11 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
...
@@ -40,17 +40,11 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
VarBool
*
pVisible
)
:
VarBool
*
pVisible
)
:
CtrlGeneric
(
pIntf
,
rHelp
,
pVisible
),
m_fsm
(
pIntf
),
m_numImg
(
numImg
),
CtrlGeneric
(
pIntf
,
rHelp
,
pVisible
),
m_fsm
(
pIntf
),
m_numImg
(
numImg
),
m_rVariable
(
rVariable
),
m_minAngle
(
minAngle
),
m_maxAngle
(
maxAngle
),
m_rVariable
(
rVariable
),
m_minAngle
(
minAngle
),
m_maxAngle
(
maxAngle
),
m_position
(
0
),
m_cmdUpDown
(
this
),
m_cmdDownUp
(
this
),
m_position
(
0
),
m_cmdMove
(
this
)
m_width
(
rBmpSeq
.
getWidth
()
),
m_height
(
rBmpSeq
.
getHeight
()
/
numImg
),
m_pImgSeq
(
rBmpSeq
.
getGraphics
()
),
m_cmdUpDown
(
this
),
m_cmdDownUp
(
this
),
m_cmdMove
(
this
)
{
{
// Build the images of the sequence
m_pImgSeq
=
OSFactory
::
instance
(
getIntf
()
)
->
createOSGraphics
(
rBmpSeq
.
getWidth
(),
rBmpSeq
.
getHeight
()
);
m_pImgSeq
->
drawBitmap
(
rBmpSeq
,
0
,
0
);
m_width
=
rBmpSeq
.
getWidth
();
m_height
=
rBmpSeq
.
getHeight
()
/
numImg
;
// States
// States
m_fsm
.
addState
(
"up"
);
m_fsm
.
addState
(
"up"
);
m_fsm
.
addState
(
"down"
);
m_fsm
.
addState
(
"down"
);
...
@@ -71,7 +65,6 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
...
@@ -71,7 +65,6 @@ CtrlRadialSlider::CtrlRadialSlider( intf_thread_t *pIntf,
CtrlRadialSlider
::~
CtrlRadialSlider
()
CtrlRadialSlider
::~
CtrlRadialSlider
()
{
{
m_rVariable
.
delObserver
(
this
);
m_rVariable
.
delObserver
(
this
);
delete
m_pImgSeq
;
}
}
...
...
modules/gui/skins2/controls/ctrl_radialslider.hpp
View file @
4166f7e8
...
@@ -76,9 +76,7 @@ private:
...
@@ -76,9 +76,7 @@ private:
/// The last received event
/// The last received event
EvtGeneric
*
m_pEvt
;
EvtGeneric
*
m_pEvt
;
/// Sequence of images
/// Sequence of images
OSGraphics
*
m_pImgSeq
;
const
OSGraphics
*
const
m_pImgSeq
;
/// Last saved position
int
m_lastPos
;
/// Callback objects
/// Callback objects
DEFINE_CALLBACK
(
CtrlRadialSlider
,
UpDown
)
DEFINE_CALLBACK
(
CtrlRadialSlider
,
UpDown
)
...
...
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