From 7ca9fba4a85189756aa0bf292271ed1c69261bae Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Thu, 5 Mar 2015 14:51:33 +0000 Subject: [PATCH] Fix some off-by-one errors in variants GUI --- src/GUI/QtLauncher.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx index 71c83fe40..5775a442d 100644 --- a/src/GUI/QtLauncher.cxx +++ b/src/GUI/QtLauncher.cxx @@ -293,9 +293,9 @@ public: quint32 variantIndex = m_activeVariant.at(index.row()); if (variantIndex) { - if (variantIndex < item->variants.count()) { + if (variantIndex <= item->variants.count()) { // show the selected variant - item = item->variants.at(variantIndex); + item = item->variants.at(variantIndex - 1); } } @@ -424,7 +424,7 @@ public: if (variantCount > 0) { bool canLeft = (currentVariant > 0); - bool canRight = (currentVariant < (variantCount - 1)); + bool canRight = (currentVariant < variantCount ); QRect leftArrowRect = leftCycleArrowRect(option.rect, index); painter->fillRect(leftArrowRect, canLeft ? Qt::black : Qt::gray); @@ -486,7 +486,7 @@ public: m_view->model()->setData(index, variantIndex - 1, AircraftVariantRole); emit variantChanged(index); return true; - } else if ((variantIndex < (variantCount - 1)) && rightCycleRect.contains(me->pos())) { + } else if ((variantIndex < variantCount) && rightCycleRect.contains(me->pos())) { m_view->model()->setData(index, variantIndex + 1, AircraftVariantRole); emit variantChanged(index); return true;