From eb8ad6b46d2d65b6fd532b67818c4fdf7a00fc9b Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 12 Jun 2005 10:46:34 +0200 Subject: Added cOsdMenu::SetCols() to allow adjusting the menu columns --- HISTORY | 1 + osdbase.c | 17 +++++++++++------ osdbase.h | 3 ++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/HISTORY b/HISTORY index 626ce2bf..3b5ab300 100644 --- a/HISTORY +++ b/HISTORY @@ -3603,3 +3603,4 @@ Video Disk Recorder Revision History an NVOD event (thanks to Chris Warren). - 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). +- Added cOsdMenu::SetCols() to allow adjusting the menu columns. diff --git a/osdbase.c b/osdbase.c index ad07dcff..7d03dbd0 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.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" @@ -74,11 +74,7 @@ cOsdMenu::cOsdMenu(const char *Title, int c0, int c1, int c2, int c3, int c4) hasHotkeys = false; title = NULL; SetTitle(Title); - cols[0] = c0; - cols[1] = c1; - cols[2] = c2; - cols[3] = c3; - cols[4] = c4; + SetCols(c0, c1, c2, c3, c4); first = 0; current = marked = -1; subMenu = NULL; @@ -116,6 +112,15 @@ const char *cOsdMenu::hk(const char *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) { hasHotkeys = true; diff --git a/osdbase.h b/osdbase.h index 53fbf6b8..bcb3c404 100644 --- a/osdbase.h +++ b/osdbase.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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 @@ -98,6 +98,7 @@ private: protected: cSkinDisplayMenu *DisplayMenu(void) { return displayMenu; } 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); virtual void Clear(void); bool SelectableItem(int idx); -- cgit v1.2.3