Choice and Roller updates

This commit is contained in:
Bertrand Songis
2020-05-13 11:49:12 +02:00
parent ca4e865427
commit 514f966435
2 changed files with 50 additions and 9 deletions
+36
View File
@@ -87,6 +87,42 @@ class Choice : public ChoiceBase {
isValueAvailable = std::move(handler);
}
unsigned getIndexFromValue(int value)
{
if (!isValueAvailable) {
return value - vmin;
}
unsigned index = 0;
for (int i = vmin; i < value; i++) {
if (isValueAvailable(i)) {
index++;
}
}
return index;
}
int getValueFromIndex(unsigned index)
{
if (!isValueAvailable) {
return vmin + index;
}
int value = vmin;
while (index > 0) {
while (value < vmax && !isValueAvailable(value)) {
value++;
}
index--;
}
return value;
}
int getValuesCount()
{
return getIndexFromValue(vmax + 1);
}
void setTextHandler(std::function<std::string(int32_t)> handler)
{
textHandler = std::move(handler);
+14 -9
View File
@@ -53,8 +53,7 @@ class Roller: public Choice {
setHeight(ROLLER_LINE_HEIGHT * 3 - 1);
setPageHeight(ROLLER_LINE_HEIGHT);
setInnerHeight(INFINITE_HEIGHT);
setScrollPositionY(ROLLER_LINE_HEIGHT * (this->getValue() - vmin - 1));
lastScrollPositionY = scrollPositionY;
updateScrollPositionFromValue();
}
#if defined(DEBUG_WINDOWS)
@@ -73,9 +72,9 @@ class Roller: public Choice {
coord_t yMax = scrollPositionY + 3 * ROLLER_LINE_HEIGHT;
while (y < yMax) {
auto displayedValue = vmin + index % (vmax - vmin + 1);
auto displayedValue = getValueFromIndex(index % getValuesCount());
if (displayedValue < vmin)
displayedValue += vmax - vmin + 1;
displayedValue += getValuesCount();
auto fgColor = DISABLE_COLOR;
@@ -104,8 +103,7 @@ class Roller: public Choice {
Window::checkEvents();
if (lastEditMode != editMode) {
setScrollPositionY(ROLLER_LINE_HEIGHT * (this->getValue() - vmin - 1));
lastScrollPositionY = scrollPositionY;
updateScrollPositionFromValue();
lastEditMode = editMode;
}
@@ -122,13 +120,20 @@ class Roller: public Choice {
coord_t lastScrollPositionY = 0;
bool lastEditMode = false;
void updateScrollPositionFromValue()
{
setScrollPositionY(ROLLER_LINE_HEIGHT * (getIndexFromValue(this->getValue()) - 1));
lastScrollPositionY = scrollPositionY;
}
void updateValueFromScrollPosition()
{
lastScrollPositionY = scrollPositionY;
auto newValue = vmin + ((scrollPositionY / ROLLER_LINE_HEIGHT) + 1) % (vmax - vmin + 1);
if (newValue < vmin)
newValue += vmax - vmin + 1;
auto newValue = getValueFromIndex(((scrollPositionY / ROLLER_LINE_HEIGHT) + 1) % getValuesCount());
if (newValue < vmin) {
newValue += getValuesCount();
}
setValue(newValue);
invalidate();