From 7ba596775da64f33598adc3bb21746535a50f960 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 10 Dec 2022 20:36:52 +0100 Subject: [PATCH] Fixed a GridComponent navigation issue when there was only a single column. --- es-core/src/components/IList.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h index 158b24ef1..5f0e02f3b 100644 --- a/es-core/src/components/IList.h +++ b/es-core/src/components/IList.h @@ -339,14 +339,14 @@ protected: bool doScroll {true}; // This is only needed for GridComponent. - if (mColumns != 0 && mScrollVelocity == -mColumns && mCursor < mColumns) { + if (mColumns > 1 && mScrollVelocity == -mColumns && mCursor < mColumns) { doScroll = false; } else if (mColumns != 0 && mScrollVelocity == mColumns) { if (size() - mCursor <= size() % mColumns) doScroll = false; - else if (mCursor >= (mColumns * mRows) - mColumns && size() - mCursor <= mColumns && - size() % mColumns == 0) + else if (mColumns != 1 && mCursor >= (mColumns * mRows) - mColumns && + size() - mCursor <= mColumns && size() % mColumns == 0) doScroll = false; else if (size() < mColumns) doScroll = false;