2006-02-04: Version 1.1-cvs_ext-0.8 (vdr-text2skin-1.1-cvs_ext-0.8.diff)

- added a configuration option for showing the scrollbar in the menus and
  finished implementation

1 files changed, 14 insertions, 10 deletions

diff --git a/status.c b/status.c
index 0616f7a..95e4bec 100644
--- a/status.c
+++ b/status.c
@@ -155,13 +155,16 @@ void cText2SkinStatus::OsdCurrentItem(const char *Text)
 		u->foundFirstItem = false;
 		
 		// find current item in scrollbar
-		cText2SkinRender::tMenuScrollbar *sb = &mRender->mMenuScrollbar;
-		for (int i = 0; i < sb->total; i++)
+		if (Text2SkinSetup.MenuScrollbar)
 		{
-			if (sb->items[i] == Text)
+			cText2SkinRender::tMenuScrollbar *sb = &mRender->mMenuScrollbar;
+			for (uint i = 0; i < sb->total; i++)
 			{
-				sb->current = i;
-				break;
+				if (sb->items[i] == Text)
+				{
+					sb->current = i;
+					break;
+				}
 			}
 		}
 	}
@@ -169,21 +172,22 @@ void cText2SkinStatus::OsdCurrentItem(const char *Text)
 
 void cText2SkinStatus::OsdItem(const char *Text, int Index)
 {
-	if (mRender != NULL)
+	if (mRender && Text2SkinSetup.MenuScrollbar)
 	{
+		uint curr = (uint)Index;
 		cText2SkinRender::tMenuScrollbar *sb = &mRender->mMenuScrollbar;
 		
-		if ((unsigned int)Index < sb->items.size())
+		if (curr < sb->items.size())
 		{
-			sb->items[Index] = Text;
+			sb->items[curr] = Text;
 		}
 		else
 		{
 			sb->items.push_back(Text);
-			sb->total = Index + 1;
+			sb->total = curr + 1;
 		}
 		
-		if (Index + 1 > sb->total) sb->total = Index + 1;
+		if (curr + 1 > sb->total) sb->total = curr + 1;
 	}
 }