frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed scrolling with Up/Down in case there are non-selectable items at the beginning or end of the menu

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-02-05 14:38:56 +01:00
parent 7b97eb6e97
commit 7e4662f982
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -550,6 +550,8 @@ Helmut Auer <vdr@helmutauer.de>
for suggesting to give a message when an instant recording is started for suggesting to give a message when an instant recording is started
fpr suggesting to retry a shutdown after a while fpr suggesting to retry a shutdown after a while
for separating the 'install' target into several individual targets for separating the 'install' target into several individual targets
for reporting a problem with scrolling with Up/Down in case there are non-selectable
items at the beginning of the menu
Jeremy Hall <jhall@UU.NET> Jeremy Hall <jhall@UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c for fixing an incomplete initialization of the filter parameters in eit.c

2
HISTORY
View File

@ -4312,3 +4312,5 @@ Video Disk Recorder Revision History
- Renamed the Makefile target 'plugins-clean' to 'clean-plugins' (suggested by - Renamed the Makefile target 'plugins-clean' to 'clean-plugins' (suggested by
Sebastian Frei). Sebastian Frei).
- Made all font and image data 'const' (thanks to Darren Salt). - Made all font and image data 'const' (thanks to Darren Salt).
- Fixed scrolling with Up/Down in case there are non-selectable items at the
beginning or end of the menu (reported by Helmut Auer).

14
osdbase.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: osdbase.c 1.28 2006/01/08 11:40:02 kls Exp $ * $Id: osdbase.c 1.29 2006/02/05 14:37:03 kls Exp $
*/ */
#include "osdbase.h" #include "osdbase.h"
@ -280,6 +280,12 @@ void cOsdMenu::CursorUp(void)
return; return;
while (--tmpCurrent != current) { while (--tmpCurrent != current) {
if (tmpCurrent < 0) { if (tmpCurrent < 0) {
if (first > 0) {
// make non-selectable items at the beginning visible:
first = 0;
Display();
return;
}
if (Setup.MenuScrollWrap) if (Setup.MenuScrollWrap)
tmpCurrent = last + 1; tmpCurrent = last + 1;
else else
@ -312,6 +318,12 @@ void cOsdMenu::CursorDown(void)
return; return;
while (++tmpCurrent != current) { while (++tmpCurrent != current) {
if (tmpCurrent > last) { if (tmpCurrent > last) {
if (first < last - displayMenuItems) {
// make non-selectable items at the end visible:
first = last - displayMenuItems + 1;
Display();
return;
}
if (Setup.MenuScrollWrap) if (Setup.MenuScrollWrap)
tmpCurrent = -1; tmpCurrent = -1;
else else