From c31888eeeaa7d2098fa4e0d411de330ed28cb766 Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Wed, 5 Oct 2011 16:52:27 +0000
Subject: [PATCH] channellist: better readability for right-aligned list

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1749 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/0f5bac8050193033560cfa1047972353ba79cce8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-10-05 (Wed, 05 Oct 2011)

Origin message was:
------------------
- channellist: better readability for right-aligned list

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1749 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/gui/channellist.cpp | 37 ++++++++++++++++++++++++++++++++-----
 src/gui/channellist.h   |  1 +
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 1acca5500..f6a2e2c05 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -1818,6 +1818,7 @@ void CChannelList::paintItem(int pos)
 	bool iscurrent = true;
 	bool paintbuttons = false;
 	unsigned int curr = liststart + pos;
+	int rec_mode;
 
 #if 0
 	if(CNeutrinoApp::getInstance()->recordingstatus && !autoshift && curr < chanlist.size()) {
@@ -1864,9 +1865,36 @@ void CChannelList::paintItem(int pos)
 		} else {
 			p_event = &chan->currentEvent;
 		}
-		
+
+		if (pos == 0)
+		{
+			int w_max, w_min, h;
+			ChannelList_Rec = 0;
+			int recmode_icon_max = CRecordManager::RECMODE_REC, recmode_icon_min = CRecordManager::RECMODE_TSHIFT;
+			frameBuffer->getIconSize(NEUTRINO_ICON_REC, &w_max, &h);
+			frameBuffer->getIconSize(NEUTRINO_ICON_AUTO_SHIFT, &w_min, &h);
+			if (w_max < w_min)
+			{
+				recmode_icon_max = CRecordManager::RECMODE_TSHIFT;
+				recmode_icon_min = CRecordManager::RECMODE_REC;
+				h = w_max;
+				w_max = w_min;
+				w_min = h;
+			}
+			for (uint32_t i = 0; i < chanlist.size(); i++)
+			{
+				rec_mode = CRecordManager::getInstance()->GetRecordMode(chanlist[i]->channel_id);
+				if (rec_mode == recmode_icon_max)
+				{
+					ChannelList_Rec = w_max;
+					break;
+				} else if (rec_mode == recmode_icon_min)
+					ChannelList_Rec = w_min;
+			}
+		}
+
 		//record check
-		int rec_mode = CRecordManager::getInstance()->GetRecordMode(chanlist[curr]->channel_id);
+		rec_mode = CRecordManager::getInstance()->GetRecordMode(chanlist[curr]->channel_id);
 		
 		//set recording icon
 		const char * rec_icon = "";
@@ -1877,10 +1905,9 @@ void CChannelList::paintItem(int pos)
 	
 		//calculating icons
 		int  icon_x = (x+width-15-2) - RADIUS_LARGE/2;
-		int r_icon_h=0; int r_icon_w=0;  int s_icon_h=0; int s_icon_w=0;
+		int r_icon_w=0;  int s_icon_h=0; int s_icon_w=0;
 		frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED, &s_icon_w, &s_icon_h);
-		if (rec_mode != CRecordManager::RECMODE_OFF)
-			frameBuffer->getIconSize(rec_icon, &r_icon_w, &r_icon_h);
+		r_icon_w = ChannelList_Rec;
 		int r_icon_x = icon_x;
 		
 		//paint scramble icon
diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index c40715ce7..fb90c5334 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -81,6 +81,7 @@ private:
 
 	int info_height;
 	bool new_mode_active;
+	int ChannelList_Rec;
 
 	void paintDetails(int index);
 	void clearItem2DetailsLine ();