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
fa2f997e
Commit
fa2f997e
authored
Aug 06, 2006
by
Olivier Teulière
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* skins2: Fixed resizing of the Text control
parent
29a03bfd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
modules/gui/skins2/controls/ctrl_text.cpp
modules/gui/skins2/controls/ctrl_text.cpp
+8
-2
modules/gui/skins2/controls/ctrl_text.hpp
modules/gui/skins2/controls/ctrl_text.hpp
+3
-1
No files found.
modules/gui/skins2/controls/ctrl_text.cpp
View file @
fa2f997e
...
...
@@ -242,7 +242,7 @@ void CtrlText::displayText( const UString &rText )
m_pImgDouble
=
m_rFont
.
drawString
(
doubleStringWithSep
,
m_color
);
// Update the current image used, as if the control size had changed
on
ChangePosition
();
on
PositionChange
();
if
(
m_alignment
==
kRight
&&
getPosition
()
&&
getPosition
()
->
getWidth
()
<
m_pImg
->
getWidth
()
)
...
...
@@ -281,7 +281,7 @@ void CtrlText::displayText( const UString &rText )
}
void
CtrlText
::
on
ChangePosition
()
void
CtrlText
::
on
PositionChange
()
{
if
(
m_pImg
&&
getPosition
()
)
{
...
...
@@ -303,6 +303,12 @@ void CtrlText::onChangePosition()
}
void
CtrlText
::
onResize
()
{
onPositionChange
();
}
void
CtrlText
::
CmdToManual
::
execute
()
{
EvtMouse
*
pEvtMouse
=
(
EvtMouse
*
)
m_pParent
->
m_pEvt
;
...
...
modules/gui/skins2/controls/ctrl_text.hpp
View file @
fa2f997e
...
...
@@ -131,7 +131,9 @@ class CtrlText: public CtrlGeneric, public Observer<VarText>
void
adjust
(
int
&
position
);
/// Update the behaviour of the text whenever the control size changes
virtual
void
onChangePosition
();
virtual
void
onPositionChange
();
/// Update the behaviour of the text whenever the control size changes
virtual
void
onResize
();
};
...
...
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