From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 18 Nov 2005 22:47:18 +0000 (+0000)
Subject: fix movemode
X-Git-Tag: 2.6.0~5057
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5d6aca12c38d3eee7a5d34f778c5ac93a5f6cd9f

fix movemode
---

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 9f4f2dc6..1bfc06ee 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -34,20 +34,31 @@ RESULT eBouquet::moveService(const eServiceReference &ref, unsigned int pos)
 {
 	if ( pos < 0 || pos >= m_services.size() )
 		return -1;
+	++pos;
 	list::iterator source=m_services.end();
 	list::iterator dest=m_services.end();
+	bool forward = false;
 	for (list::iterator it(m_services.begin()); it != m_services.end(); ++it)
 	{
-		if (dest == m_services.end() && !pos--)
+		if (dest == m_services.end() && !--pos)
 			dest = it;
 		if (*it == ref)
+		{
 			source = it;
+			forward = pos>0;
+		}
 		if (dest != m_services.end() && source != m_services.end())
 			break;
 	}
 	if (dest == m_services.end() || source == m_services.end() || source == dest)
 		return -1;
-	std::iter_swap(source,dest);
+	while (source != dest)
+	{
+		if (forward)
+			std::iter_swap(source++, source);
+		else
+			std::iter_swap(source--, source);
+	}
 	return 0;
 }
 
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 938b1795..fe690608 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -136,7 +136,7 @@ void eListboxServiceContent::sort()
 DEFINE_REF(eListboxServiceContent);
 
 eListboxServiceContent::eListboxServiceContent()
-	:m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_swap(m_list.end()), m_numberoffset(0)
+	:m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0)
 {
 	cursorHome();
 	eServiceCenter::getInstance(m_service_center);
@@ -144,21 +144,44 @@ eListboxServiceContent::eListboxServiceContent()
 
 void eListboxServiceContent::cursorHome()
 {
-	list::iterator old = m_cursor;
-
-	m_cursor = m_list.begin();
-	m_cursor_number = 0;
-
-	if ( m_current_marked && m_saved_cursor == m_list.end() )
-		std::iter_swap( old, m_cursor );
+	if (m_current_marked && m_saved_cursor == m_list.end())
+	{
+		while (m_cursor_number)
+		{
+			std::iter_swap(m_cursor--, m_cursor);
+			--m_cursor_number;
+			if (m_listbox && m_cursor_number)
+				m_listbox->entryChanged(m_cursor_number);
+		}
+	}
+	else
+	{
+		m_cursor = m_list.begin();
+		m_cursor_number = 0;
+	}
 }
 
 void eListboxServiceContent::cursorEnd()
 {
-	if ( m_current_marked && m_saved_cursor == m_list.end() && m_cursor != m_list.end() )
-		m_swap = m_cursor;
-	m_cursor = m_list.end();
-	m_cursor_number = m_size;
+	if (m_current_marked && m_saved_cursor == m_list.end())
+	{
+		while (m_cursor != m_list.end())
+		{
+			list::iterator prev = m_cursor++;
+			++m_cursor_number;
+			if ( prev != m_list.end() && m_cursor != m_list.end() )
+			{
+				std::iter_swap(m_cursor, prev);
+				if ( m_listbox )
+					m_listbox->entryChanged(m_cursor_number);
+			}
+		}
+	}
+	else
+	{
+		m_cursor = m_list.end();
+		m_cursor_number = m_size;
+	}
 }
 
 int eListboxServiceContent::setCurrentMarked(bool state)
@@ -204,39 +227,36 @@ int eListboxServiceContent::setCurrentMarked(bool state)
 
 int eListboxServiceContent::cursorMove(int count)
 {
-	list::iterator old = m_cursor;
-
+	int prev = m_cursor_number, last = m_cursor_number + count;
 	if (count > 0)
 	{
-		while(count && (m_cursor != m_list.end()))
+		while(count && m_cursor != m_list.end())
 		{
-			++m_cursor;
+			list::iterator prev_it = m_cursor++;
+			if ( m_current_marked && m_cursor != m_list.end() && m_saved_cursor == m_list.end() )
+			{
+				std::iter_swap(prev_it, m_cursor);
+				if ( m_listbox && prev != m_cursor_number && last != m_cursor_number )
+					m_listbox->entryChanged(m_cursor_number);
+			}
 			++m_cursor_number;
 			--count;
-		}
+	}
 	} else if (count < 0)
 	{
-		while (count && (m_cursor != m_list.begin()))
+		while (count && m_cursor != m_list.begin())
 		{
-			--m_cursor;
+			list::iterator prev_it = m_cursor--;
+			if ( m_current_marked && m_cursor != m_list.end() && prev_it != m_list.end() && m_saved_cursor == m_list.end() )
+			{
+				std::iter_swap(prev_it, m_cursor);
+				if ( m_listbox && prev != m_cursor_number && last != m_cursor_number )
+					m_listbox->entryChanged(m_cursor_number);
+			}
 			--m_cursor_number;
 			++count;
 		}
 	}
-
-	if ( m_current_marked && m_saved_cursor == m_list.end() )
-	{
-		if ( m_cursor == m_list.end() )
-			m_swap = old;
-		else if ( old == m_list.end() )
-		{
-			std::iter_swap( m_swap, m_cursor );
-			m_swap = m_list.end();
-		}
-		else
-			std::iter_swap( old, m_cursor );
-	}
-
 	return 0;
 }
 
diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index b06e7ef8..dde08188 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -93,7 +93,6 @@ private:
 
 		/* support for movemode */
 	bool m_current_marked;
-	list::iterator m_swap;
 
 	int m_numberoffset;
 };