Selection are now updated when appending/prepending/inserting/removing an item

Author: victorlevasseur

examples/ListBox.cpp

@@ -87,6 +87,8 @@ int main() {
 
     window.resetGLStates();
 
+	int i = 0;
+
     while (window.isOpen())
         {
             while (window.pollEvent(event))
@@ -97,6 +99,20 @@ int main() {
                     case sf::Event::Closed:
                         window.close();
                     	break;
+					case sf::Event::KeyPressed:
+						if( event.key.code == sf::Keyboard::R ) {
+							listbox3->RemoveItem(2);
+						} else if( event.key.code == sf::Keyboard::I ) {
+							listbox3->InsertItem(3, "Inserted item #" + std::to_string(i));
+							++i;
+						} else if( event.key.code == sf::Keyboard::A) {
+							listbox3->AppendItem("Appended item #" + std::to_string(i));
+							++i;
+						} else if( event.key.code == sf::Keyboard::P) {
+							listbox3->PrependItem("Prepended item #" + std::to_string(i));
+							++i;
+						}
+						break;
 					default:
 						break;
                 }

include/SFGUI/ListBox.hpp

@@ -5,6 +5,7 @@
 
 #include <SFML/System/String.hpp>
 #include <memory>
+#include <set>
 #include <vector>
 
 namespace sfg {
@@ -60,6 +61,7 @@ class SFGUI_API ListBox : public Container {
 		IndexType GetMaxDisplayedItemsCount() const;
 
 		void AppendItem( const sf::String& str );
+		void InsertItem( IndexType index, const sf::String& str );
 		void PrependItem( const sf::String& str );
 		void RemoveItem( IndexType index );
 		void Clear();
@@ -108,7 +110,7 @@ class SFGUI_API ListBox : public Container {
 		std::vector<sf::String> m_items;
 
 		SelectionMode m_selection_mode;
-		std::vector<IndexType> m_selected_items;
+		std::set<IndexType> m_selected_items;
 
 		IndexType m_highlighted_item;
 

src/SFGUI/ListBox.cpp

@@ -3,6 +3,9 @@
 #include <SFGUI/Engine.hpp>
 #include <SFGUI/RenderQueue.hpp>
 #include <SFGUI/Widgets.hpp>
+
+#include <algorithm>
+
 #include <SFML/Graphics.hpp>
 
 namespace sfg {
@@ -87,7 +90,7 @@ ListBox::IndexType ListBox::GetHighlightedItem() const {
 }
 
 bool ListBox::IsItemSelected(IndexType index) const {
-	return std::find(m_selected_items.begin(), m_selected_items.end(), index) != m_selected_items.end();
+	return m_selected_items.find( index ) != m_selected_items.end();
 }
 
 ListBox::IndexType ListBox::GetSelectedItemsCount() const {
@@ -97,11 +100,14 @@ ListBox::IndexType ListBox::GetSelectedItemsCount() const {
 ListBox::IndexType ListBox::GetSelectedItemIndex( IndexType index ) const {
     if( index >= m_selected_items.size() )
 		return NONE;
-	return m_selected_items[ index ];
+
+	auto it = m_selected_items.cbegin();
+	std::advance( it, index );
+	return *it;
 }
 
 const sf::String& ListBox::GetSelectedItemText( IndexType index ) const {
-	return m_items[ m_selected_items[ index ] ];
+	return m_items[ GetSelectedItemIndex( index ) ];
 }
 
 ListBox::IndexType ListBox::GetFirstDisplayedItemIndex() const {
@@ -117,7 +123,30 @@ ListBox::IndexType ListBox::GetMaxDisplayedItemsCount() const {
 }
 
 void ListBox::AppendItem( const sf::String& str ) {
-    m_items.push_back(str);
+    m_items.push_back( str );
+
+	UpdateDisplayedItems();
+    RequestResize();
+    Invalidate();
+}
+
+void ListBox::InsertItem( IndexType index, const sf::String& str ) {
+	m_items.insert( m_items.begin() + index, str );
+
+	// Update next selected indexes (decrement them).
+	std::set<IndexType> new_selected_items;
+	std::transform(
+		m_selected_items.cbegin(),
+		m_selected_items.cend(),
+		std::inserter(new_selected_items, new_selected_items.end()),
+		[&](IndexType i){
+			if( i < index )
+			 	return i;
+			else
+				return ++i;
+		}
+	);
+	m_selected_items = std::move(new_selected_items);
 
 	UpdateDisplayedItems();
     RequestResize();
@@ -127,6 +156,18 @@ void ListBox::AppendItem( const sf::String& str ) {
 void ListBox::PrependItem( const sf::String& str ) {
     m_items.insert( m_items.begin(), str );
 
+	// Update selected items indexes.
+	std::set<IndexType> new_selected_items;
+	std::transform(
+		m_selected_items.cbegin(),
+		m_selected_items.cend(),
+		std::inserter(new_selected_items, new_selected_items.end()),
+		[&](IndexType i){
+			return ++i;
+		}
+	);
+	m_selected_items = std::move(new_selected_items);
+
 	UpdateDisplayedItems();
 	RequestResize();
     Invalidate();
@@ -135,13 +176,32 @@ void ListBox::PrependItem( const sf::String& str ) {
 void ListBox::RemoveItem( IndexType index ) {
     m_items.erase( m_items.begin() + index );
 
+	// Remove it from the selected indexes.
+	m_selected_items.erase( index );
+
+	// Update next selected indexes (decrement them).
+	std::set<IndexType> new_selected_items;
+	std::transform(
+		m_selected_items.cbegin(),
+		m_selected_items.cend(),
+		std::inserter(new_selected_items, new_selected_items.end()),
+		[&](IndexType i){
+			if( i > index )
+			 	return --i;
+			else
+				return i;
+		}
+	);
+	m_selected_items = std::move(new_selected_items);
+
 	UpdateDisplayedItems();
 	RequestResize();
     Invalidate();
 }
 
 void ListBox::Clear() {
     m_items.clear();
+	m_selected_items.clear();
 
 	UpdateDisplayedItems();
 	RequestResize();
@@ -159,7 +219,9 @@ void ListBox::SetSelectionMode( SelectionMode mode ) {
 		m_selected_items.clear();
 		Invalidate();
 	} else if( m_selection_mode == SelectionMode::SINGLE_SELECTION && m_selected_items.size() > 1 ) {
-		m_selected_items.resize( 1 );
+		auto it = m_selected_items.begin();
+		std::advance( it, 1 );
+		m_selected_items.erase( it, m_selected_items.end() );
 	}
 }
 
@@ -242,17 +304,16 @@ void ListBox::HandleMouseButtonEvent( sf::Mouse::Button button, bool press, int
 
 							// Clear the selection and add the item to the selection.
 							m_selected_items.clear();
-							m_selected_items.push_back( clicked_item_index );
+							m_selected_items.insert( clicked_item_index );
 						} else {
 							// In MULTI_SELECTION and when Ctrl is pressed, the selection has changed (as if the clicked item is already selected, it is removed from the selection).
 							selection_changed = true;
 
 							// Add or remove the clicked item, depending on if it was in the selection or not.
-							auto iterator_to_clicked_index = std::find( m_selected_items.begin(), m_selected_items.end(), clicked_item_index );
-							if(iterator_to_clicked_index  == m_selected_items.end() )
-								m_selected_items.push_back( clicked_item_index );
+							if(m_selected_items.find( clicked_item_index ) == m_selected_items.end() )
+								m_selected_items.insert( clicked_item_index );
 							else
-								m_selected_items.erase(iterator_to_clicked_index);
+								m_selected_items.erase( clicked_item_index );
 						}
 
 						if( selection_changed ) // Only emit the OnSelect signal if the selection changed.