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

correction of the high-speed scrolling up and down limit

Browse Source
This commit is contained in:
Edouard Dupin 2012-04-16 09:15:56 +02:00
parent f445dbd524
commit 09f8b5edd2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/libewol/ewol/widget/WidgetScrolled.cpp
View File

@ -168,16 +168,12 @@ bool ewol::WidgetScrooled::OnEventInput(int32_t IdInput, ewol::eventInputType_te
#else #else
if (4 == IdInput && ewol::EVENT_INPUT_TYPE_UP == typeEvent) { if (4 == IdInput && ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
m_originScrooled.y -= m_pixelScrolling; m_originScrooled.y -= m_pixelScrolling;
if (m_originScrooled.y < 0) { m_originScrooled.y = etk_avg(0, m_originScrooled.y, m_maxSize.y);
m_originScrooled.y = 0;
}
MarkToReedraw(); MarkToReedraw();
return true; return true;
} else if (5 == IdInput && ewol::EVENT_INPUT_TYPE_UP == typeEvent) { } else if (5 == IdInput && ewol::EVENT_INPUT_TYPE_UP == typeEvent) {
m_originScrooled.y += m_pixelScrolling; m_originScrooled.y += m_pixelScrolling;
if (m_maxSize.y < m_originScrooled.y) { m_originScrooled.y = etk_avg(0, m_originScrooled.y, m_maxSize.y);
m_originScrooled.y = m_maxSize.y;
}
MarkToReedraw(); MarkToReedraw();
return true; return true;
}else if (2 == IdInput) { }else if (2 == IdInput) {
@ -215,13 +211,16 @@ bool ewol::WidgetScrooled::OnEventInput(int32_t IdInput, ewol::eventInputType_te
} }
MarkToReedraw(); MarkToReedraw();
} }
m_originScrooled.y = etk_avg(0, m_originScrooled.y, m_maxSize.y);
return true; return true;
} if (ewol::SCROLL_ENABLE_HORIZONTAL==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) { } if (ewol::SCROLL_ENABLE_HORIZONTAL==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
m_originScrooled.x = (int32_t)(m_maxSize.x * relativePos.x / m_size.x); m_originScrooled.x = (int32_t)(m_maxSize.x * relativePos.x / m_size.x);
m_originScrooled.x = etk_avg(0, m_originScrooled.x, m_maxSize.x);
MarkToReedraw(); MarkToReedraw();
return true; return true;
} if (ewol::SCROLL_ENABLE_VERTICAL==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) { } if (ewol::SCROLL_ENABLE_VERTICAL==m_highSpeedMode && ewol::EVENT_INPUT_TYPE_MOVE == typeEvent) {
m_originScrooled.y = (int32_t)(m_maxSize.y * relativePos.y / m_size.y); m_originScrooled.y = (int32_t)(m_maxSize.y * relativePos.y / m_size.y);
m_originScrooled.y = etk_avg(0, m_originScrooled.y, m_maxSize.y);
MarkToReedraw(); MarkToReedraw();
return true; return true;
} }