From e6eea29fda90b7151fb459c353394155287da4df Mon Sep 17 00:00:00 2001 From: louis Date: Fri, 20 Mar 2015 15:28:01 +0100 Subject: fixed display of background if recmenu was hidden --- HISTORY | 2 ++ recmenu.c | 8 +++++++- recmenu.h | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 2dc135c..ad5f843 100644 --- a/HISTORY +++ b/HISTORY @@ -9,4 +9,6 @@ Version 0.0.2 - fixed bug that timemanager does not use configured display time - fixed crash if a channel group is empty +- fixed display of background if recmenu was hidden + diff --git a/recmenu.c b/recmenu.c index 76a97ee..29832e2 100644 --- a/recmenu.c +++ b/recmenu.c @@ -4,6 +4,7 @@ // --- cRecMenu ------------------------------------------------------------- cRecMenu::cRecMenu() { + hidden = false; menuWidth = 50; menuHeight = 0; maxMenuHeight = 98; @@ -36,6 +37,8 @@ cRecMenu::~cRecMenu(void) { recMenuGrid->Clear(); delete recMenuGrid; } + if (hidden) + osdView->Activate(); } /******************************************************************** @@ -280,8 +283,11 @@ void cRecMenu::InitMenuItems(void) { current = menuItems.Next(current); } DrawBackground(); - if (scrolling) + Flush(); + if (scrolling) { DrawScrollbar(); + Flush(); + } } int cRecMenu::GetHeight(void) { diff --git a/recmenu.h b/recmenu.h index 99111c2..ef7f8b2 100644 --- a/recmenu.h +++ b/recmenu.h @@ -9,6 +9,7 @@ class cRecMenu { private: + bool hidden; int menuWidth; int menuHeight; int maxMenuHeight; @@ -51,8 +52,8 @@ public: void Init(cOsdView *osdView); void DrawBackground(void); void Draw(void); - void Hide(void) { osdView->Deactivate(true); }; - void Show(void) { osdView->Activate(); }; + void Hide(void) { hidden = true; osdView->Deactivate(true); }; + void Show(void) { hidden = false; osdView->Activate(); }; void Flush(void) { osdView->Display(); }; virtual eRecMenuState ProcessKey(eKeys Key); }; -- cgit v1.2.3