piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Roller fixes

Browse Source
This commit is contained in:
Bertrand Songis
2020-05-14 09:22:25 +02:00
parent 4ac45a55fb
commit c4164e8302
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/roller.h
Vendored
+4 -7
View File
@@ -66,15 +66,14 @@ class Roller: public Choice {
void paint(BitmapBuffer * dc) override
{
int32_t value = getValue();
auto valuesCount = getValuesCount();
int index = (scrollPositionY - ROLLER_LINE_HEIGHT + 1) / ROLLER_LINE_HEIGHT;
coord_t y = index * ROLLER_LINE_HEIGHT;
coord_t yMax = scrollPositionY + 3 * ROLLER_LINE_HEIGHT;
while (y < yMax) {
auto displayedValue = getValueFromIndex(index % getValuesCount());
if (displayedValue < vmin)
displayedValue += getValuesCount();
auto displayedValue = getValueFromIndex((index + valuesCount) % valuesCount);
auto fgColor = DISABLE_COLOR;
@@ -130,10 +129,8 @@ class Roller: public Choice {
{
lastScrollPositionY = scrollPositionY;
auto newValue = getValueFromIndex(((scrollPositionY / ROLLER_LINE_HEIGHT) + 1) % getValuesCount());
if (newValue < vmin) {
newValue += getValuesCount();
}
auto valuesCount = getValuesCount();
auto newValue = getValueFromIndex((((scrollPositionY / ROLLER_LINE_HEIGHT) + 1) + valuesCount) % valuesCount);
setValue(newValue);
invalidate();