summaryrefslogtreecommitdiff
path: root/osdbase.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-06-12 10:02:59 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2005-06-12 10:02:59 +0200
commit7a990fcf88c6511c1b9dc17d9a26109c91123195 (patch)
tree5622d6152df1c2fe492ef0601a2142251a46fb5a /osdbase.c
parent903a2d585033baba47288735a42e3e1146d6bfd6 (diff)
downloadvdr-7a990fcf88c6511c1b9dc17d9a26109c91123195.tar.gz
vdr-7a990fcf88c6511c1b9dc17d9a26109c91123195.tar.bz2
Fixed handling page up/down in menu lists in case there are several non selectable items in a row
Diffstat (limited to 'osdbase.c')
-rw-r--r--osdbase.c67
1 files changed, 49 insertions, 18 deletions
diff --git a/osdbase.c b/osdbase.c
index ec04adb8..ad07dcff 100644
--- a/osdbase.c
+++ b/osdbase.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osdbase.c 1.15 2005/01/07 16:16:41 kls Exp $
+ * $Id: osdbase.c 1.16 2005/06/12 09:55:56 kls Exp $
*/
#include "osdbase.h"
@@ -258,7 +258,8 @@ void cOsdMenu::CursorUp(void)
{
if (current > 0) {
int tmpCurrent = current;
- while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent));
+ while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent))
+ ;
if (tmpCurrent < 0)
return;
if (tmpCurrent >= first)
@@ -282,7 +283,8 @@ void cOsdMenu::CursorDown(void)
if (current < last) {
int tmpCurrent = current;
- while (++tmpCurrent <= last && !SelectableItem(tmpCurrent));
+ while (++tmpCurrent <= last && !SelectableItem(tmpCurrent))
+ ;
if (tmpCurrent > last)
return;
if (tmpCurrent <= lastOnScreen)
@@ -306,33 +308,62 @@ void cOsdMenu::CursorDown(void)
void cOsdMenu::PageUp(void)
{
+ int oldCurrent = current;
+ int oldFirst = first;
current -= displayMenuItems;
first -= displayMenuItems;
+ int last = Count() - 1;
+ if (current < 0)
+ current = 0;
if (first < 0)
- first = current = 0;
- if (!SelectableItem(current)) {
- current -= (current > 0) ? 1 : -1;
- first = min(first, current - 1);
+ first = 0;
+ int tmpCurrent = current;
+ while (!SelectableItem(tmpCurrent) && --tmpCurrent >= 0)
+ ;
+ if (tmpCurrent < 0) {
+ tmpCurrent = current;
+ while (++tmpCurrent <= last && !SelectableItem(tmpCurrent))
+ ;
+ }
+ current = tmpCurrent <= last ? tmpCurrent : -1;
+ if (current >= 0) {
+ if (current < first)
+ first = current;
+ else if (current - first >= displayMenuItems)
+ first = current - displayMenuItems + 1;
+ }
+ if (current != oldCurrent || first != oldFirst) {
+ Display();
+ DisplayCurrent(true);
}
- Display();
- DisplayCurrent(true);
}
void cOsdMenu::PageDown(void)
{
+ int oldCurrent = current;
+ int oldFirst = first;
current += displayMenuItems;
first += displayMenuItems;
- int count = Count();
- if (current > count - 1) {
- current = count - 1;
- first = max(0, count - displayMenuItems);
+ int last = Count() - 1;
+ int tmpCurrent = current;
+ while (!SelectableItem(tmpCurrent) && ++tmpCurrent <= last)
+ ;
+ if (tmpCurrent > last) {
+ tmpCurrent = current;
+ while (--tmpCurrent >= 0 && !SelectableItem(tmpCurrent))
+ ;
}
- if (!SelectableItem(current)) {
- current += (current < count - 1) ? 1 : -1;
- first = max(first, current - displayMenuItems);
+ current = tmpCurrent > 0 ? tmpCurrent : -1;
+ if (current >= 0) {
+ if (current < first)
+ first = current;
+ else if (current - first >= displayMenuItems)
+ first = current - displayMenuItems + 1;
+ }
+ if (current != oldCurrent || first != oldFirst) {
+ Display();
+ DisplayCurrent(true);
}
- Display();
- DisplayCurrent(true);
}
void cOsdMenu::Mark(void)