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
dacc4c15
Commit
dacc4c15
authored
Apr 03, 2004
by
Cyril Deguet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ctrl_text.cpp: check if the scrolling is still necessary when the
text is updated (avoid many crashes)
parent
fb4b9071
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
2 deletions
+19
-2
modules/gui/skins2/controls/ctrl_text.cpp
modules/gui/skins2/controls/ctrl_text.cpp
+19
-2
No files found.
modules/gui/skins2/controls/ctrl_text.cpp
View file @
dacc4c15
...
@@ -205,6 +205,23 @@ void CtrlText::displayText( const UString &rText )
...
@@ -205,6 +205,23 @@ void CtrlText::displayText( const UString &rText )
// Update the current image used, as if the control size had changed
// Update the current image used, as if the control size had changed
onChangePosition
();
onChangePosition
();
m_xPos
=
0
;
// If the control was in the moving state, check if the scrolling is
// still necessary
const
string
&
rState
=
m_fsm
.
getState
();
if
(
rState
==
"moving"
||
rState
==
"outMoving"
)
{
if
(
m_pImg
&&
m_pImg
->
getWidth
()
>=
getPosition
()
->
getWidth
()
)
{
m_pCurrImg
=
m_pImgDouble
;
m_pTimer
->
start
(
MOVING_TEXT_DELAY
,
false
);
}
else
{
m_pTimer
->
stop
();
}
}
notifyLayout
();
notifyLayout
();
}
}
...
@@ -314,10 +331,10 @@ void CtrlText::adjust( int &position )
...
@@ -314,10 +331,10 @@ void CtrlText::adjust( int &position )
{
{
return
;
return
;
}
}
position
%=
m_pImgDouble
->
getWidth
()
-
m_pImg
->
getWidth
();
position
%=
m_pImgDouble
->
getWidth
()
-
m_pImg
->
getWidth
();
if
(
position
>
0
)
if
(
position
>
0
)
{
{
position
-=
m_pImgDouble
->
getWidth
()
-
m_pImg
->
getWidth
();
position
-=
m_pImgDouble
->
getWidth
()
-
m_pImg
->
getWidth
();
}
}
}
}
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