[Seq-cvs-commit] SF.net SVN: seq:[1110] showeq/branches/pre_6_0_beta/src

[<cn...@us...>]

Revision: 1110
          http://sourceforge.net/p/seq/svn/1110
Author:   cn187
Date:     2020-11-18 03:16:13 +0000 (Wed, 18 Nov 2020)
Log Message:
-----------
Don't automatically select next spawn in list when current target despawns

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/interface.cpp
    showeq/branches/pre_6_0_beta/src/spawnlist.cpp
    showeq/branches/pre_6_0_beta/src/spawnlist2.cpp

Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp	2020-11-17 23:54:11 UTC (rev 1109)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp	2020-11-18 03:16:13 UTC (rev 1110)
@@ -4878,7 +4878,8 @@
   if (m_selectedSpawn == item)
   {
     m_selectedSpawn = 0;
-  
+    stsMessage("");
+
     // notify others of the new selected spawn
     emit selectSpawn(m_selectedSpawn);
   }

Modified: showeq/branches/pre_6_0_beta/src/spawnlist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist.cpp	2020-11-17 23:54:11 UTC (rev 1109)
+++ showeq/branches/pre_6_0_beta/src/spawnlist.cpp	2020-11-18 03:16:13 UTC (rev 1110)
@@ -463,6 +463,11 @@
      // if there was an item, delete it and all it's children
      if (j)
      {
+       if (j == currentItem())
+       {
+           selectionModel()->setCurrentIndex(QModelIndex(), QItemSelectionModel::NoUpdate);
+           clearSelection();
+       }
        delList += j->takeChildren();
 
        // get the category that the item SpawnListItem belongs to

Modified: showeq/branches/pre_6_0_beta/src/spawnlist2.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlist2.cpp	2020-11-17 23:54:11 UTC (rev 1109)
+++ showeq/branches/pre_6_0_beta/src/spawnlist2.cpp	2020-11-18 03:16:13 UTC (rev 1110)
@@ -289,6 +289,13 @@
   // find the list item
   SpawnListItem* litem = find(item);
 
+  if (item == m_selectedItem)
+  {
+      m_selectedItem = NULL;
+      m_spawnList->selectionModel()->setCurrentIndex(QModelIndex(), QItemSelectionModel::NoUpdate);
+      m_spawnList->clearSelection();
+  }
+
   // delete the list item
   if (litem != NULL)
   {
@@ -297,8 +304,6 @@
     updateCount();
   }
 
-  if (item == m_selectedItem)
-    m_selectedItem = NULL;
 }
 
 void SpawnListWindow2::changeItem(const Item* item, uint32_t changeItem)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.