atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correction of the scrool widget

Browse Source
This commit is contained in:
Edouard DUPIN 2014-04-18 21:21:46 +02:00
parent ab770771cc
commit 624d28af36
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sources/ewol/widget/WidgetScrolled.cpp
View File

@ -86,7 +86,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
if ( _event.getId() == 1 if ( _event.getId() == 1
&& _event.getStatus() == ewol::key::statusDown) { && _event.getStatus() == ewol::key::statusDown) {
// check if selected the scrolling position whth the scrolling bar ... // check if selected the scrolling position whth the scrolling bar ...
if (relativePos.x() >= (m_size.x()-paddingV.xLeft())) { if (relativePos.x() >= (m_size.x()-paddingV.x())) {
if( m_size.y() < m_maxSize.y() if( m_size.y() < m_maxSize.y()
|| m_originScrooled.y() != 0) { || m_originScrooled.y() != 0) {
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableVertical; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableVertical;
@ -100,7 +100,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
markToRedraw(); markToRedraw();
return true; return true;
} }
} else if (relativePos.y() >= (m_size.y()-paddingH.yButtom())) { } else if (relativePos.y() >= (m_size.y()-paddingH.y())) {
if( m_size.x() < m_maxSize.x() if( m_size.x() < m_maxSize.x()
|| m_originScrooled.x()!=0) { || m_originScrooled.x()!=0) {
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal;
@ -110,7 +110,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
m_highSpeedButton = 1; m_highSpeedButton = 1;
// force direct scrolling in this case // force direct scrolling in this case
m_originScrooled.setX((int32_t)(m_maxSize.x() * (relativePos.x()-paddingH.xLeft()) / (m_size.x()-paddingH.xLeft()*2))); m_originScrooled.setX((int32_t)(m_maxSize.x() * (relativePos.x()-paddingH.xLeft()) / (m_size.x()-paddingH.xLeft()*2)));
m_originScrooled.setY(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling))); m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
markToRedraw(); markToRedraw();
return true; return true;
} }
@ -202,16 +202,9 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
if ( _event.getId() == m_highSpeedButton if ( _event.getId() == m_highSpeedButton
&& m_highSpeedMode != ewol::widget::Scroll::speedModeDisable) { && m_highSpeedMode != ewol::widget::Scroll::speedModeDisable) {
if (_event.getStatus() == ewol::key::statusUpAfter) { if (_event.getStatus() == ewol::key::statusUpAfter) {
if (m_highSpeedMode == ewol::widget::Scroll::speedModeInit) {
// TODO : generate back the down event ...
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_highSpeedType = ewol::key::typeUnknow; m_highSpeedType = ewol::key::typeUnknow;
return false; return false;
} else {
m_highSpeedMode = ewol::widget::Scroll::speedModeGrepEndEvent;
markToRedraw();
return true;
}
} else if (m_highSpeedMode == ewol::widget::Scroll::speedModeGrepEndEvent) { } else if (m_highSpeedMode == ewol::widget::Scroll::speedModeGrepEndEvent) {
if (_event.getStatus() == ewol::key::statusSingle) { if (_event.getStatus() == ewol::key::statusSingle) {
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
@ -220,6 +213,8 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
markToRedraw(); markToRedraw();
} }
return true; return true;
} else if (_event.getStatus() == ewol::key::statusUp) {
return true;
} else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit } else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit
&& _event.getStatus() == ewol::key::statusMove) { && _event.getStatus() == ewol::key::statusMove) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :