1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Added cOsdMenu::SetCols() to allow adjusting the menu columns

This commit is contained in:
Klaus Schmidinger 2005-06-12 10:46:34 +02:00
parent 7a990fcf88
commit eb8ad6b46d
3 changed files with 14 additions and 7 deletions

View File

@ -3603,3 +3603,4 @@ Video Disk Recorder Revision History
an NVOD event (thanks to Chris Warren). an NVOD event (thanks to Chris Warren).
- Fixed handling page up/down in menu lists in case there are several non selectable - Fixed handling page up/down in menu lists in case there are several non selectable
items in a row (thanks to Udo Richter for reporting this one). items in a row (thanks to Udo Richter for reporting this one).
- Added cOsdMenu::SetCols() to allow adjusting the menu columns.

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.16 2005/06/12 09:55:56 kls Exp $ * $Id: osdbase.c 1.17 2005/06/12 10:44:22 kls Exp $
*/ */
#include "osdbase.h" #include "osdbase.h"
@ -74,11 +74,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4)
hasHotkeys = false; hasHotkeys = false;
title = NULL; title = NULL;
SetTitle(Title); SetTitle(Title);
cols[0] = c0; SetCols(c0, c1, c2, c3, c4);
cols[1] = c1;
cols[2] = c2;
cols[3] = c3;
cols[4] = c4;
first = 0; first = 0;
current = marked = -1; current = marked = -1;
subMenu = NULL; subMenu = NULL;
@ -116,6 +112,15 @@ const char *cOsdMenu::hk(const char *s)
return s; return s;
} }
void cOsdMenu::SetCols(int c0, int c1, int c2, int c3, int c4)
{
cols[0] = c0;
cols[1] = c1;
cols[2] = c2;
cols[3] = c3;
cols[4] = c4;
}
void cOsdMenu::SetHasHotkeys(void) void cOsdMenu::SetHasHotkeys(void)
{ {
hasHotkeys = true; hasHotkeys = true;

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.h 1.10 2004/04/30 13:40:11 kls Exp $ * $Id: osdbase.h 1.11 2005/06/12 10:46:34 kls Exp $
*/ */
#ifndef __OSDBASE_H #ifndef __OSDBASE_H
@ -98,6 +98,7 @@ private:
protected: protected:
cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; } cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; }
const char *hk(const char *s); const char *hk(const char *s);
void SetCols(int c0, int c1 = 0, int c2 = 0, int c3 = 0, int c4 = 0);
void SetHasHotkeys(void); void SetHasHotkeys(void);
virtual void Clear(void); virtual void Clear(void);
bool SelectableItem(int idx); bool SelectableItem(int idx);