From 1d1f1e3ae9bcffb29a02cccb8c807e757fe24e18 Mon Sep 17 00:00:00 2001 From: satbaby Date: Wed, 30 Jan 2013 23:49:43 +0100 Subject: [PATCH] delete src/gui/channellist.cpp.rej --- src/gui/channellist.cpp.rej | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/gui/channellist.cpp.rej diff --git a/src/gui/channellist.cpp.rej b/src/gui/channellist.cpp.rej deleted file mode 100644 index 244e147aa..000000000 --- a/src/gui/channellist.cpp.rej +++ /dev/null @@ -1,27 +0,0 @@ -diff a/src/gui/channellist.cpp b/src/gui/channellist.cpp (rejected hunks) -@@ -553,6 +576,11 @@ int CChannelList::show() - COSDFader fader(g_settings.menu_Content_alpha); - fader.StartFadeIn(); - -+ if (g_settings.channellist_minitv) -+ { -+ frameBuffer->paintBoxRel(x,y,widthDetails,height + info_height,COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_ALL); -+ } -+ - paintHead(); - paint(); - frameBuffer->blit(); -@@ -886,7 +914,12 @@ int CChannelList::show() - - void CChannelList::hide() - { -- frameBuffer->paintBackgroundBoxRel(x, y, width, height+ info_height+ 5); -+ if (g_settings.channellist_minitv) -+ { -+ widthDetails = frameBuffer->getScreenWidth() - frameBuffer->getScreenX(); -+ videoDecoder->Pig(-1, -1, -1, -1); -+ } -+ frameBuffer->paintBackgroundBoxRel(x, y, widthDetails, height+ info_height+ 5); - clearItem2DetailsLine(); - frameBuffer->blit(); - }