Fix inverted conditions in shader.cpp

[dragonfireclient.git] / src / guiTable.cpp

diff --git a/src/guiTable.cpp b/src/guiTable.cpp
index b327782e28c4f44ef3b0c6aa8eaa52185d99c838..3cc95ce4fcde25bc9fba53900f7680775e2569b5 100644 (file)
--- a/src/guiTable.cpp
+++ b/src/guiTable.cpp
@@ -556,6 +556,8 @@ s32 GUITable::getSelected() const
 
 void GUITable::setSelected(s32 index)
 {
+       s32 old_selected = m_selected;
+
        m_selected = -1;
        m_sel_column = 0;
        m_sel_doubleclick = false;
@@ -572,7 +574,8 @@ void GUITable::setSelected(s32 index)
        }
 
        // If the selected row is not visible, open its ancestors to make it visible
-       if (m_rows[index].visible_index < 0) {
+       bool selection_invisible = m_rows[index].visible_index < 0;
+       if (selection_invisible) {
                std::set<s32> opened_trees;
                getOpenedTrees(opened_trees);
                s32 indent = m_rows[index].indent;
@@ -590,7 +593,9 @@ void GUITable::setSelected(s32 index)
                assert(m_selected >= 0 && m_selected < (s32) m_visible_rows.size());
        }
 
-       autoScroll();
+       if (m_selected != old_selected || selection_invisible) {
+               autoScroll();
+       }
 }
 
 GUITable::DynamicData GUITable::getDynamicData() const
@@ -923,6 +928,11 @@ bool GUITable::OnEvent(const SEvent &event)
                                                sel_doubleclick) {
                                        sendTableEvent(sel_column, sel_doubleclick);
                                }
+
+                               // Treeview: double click opens/closes trees
+                               if (m_has_tree_column && sel_doubleclick) {
+                                       toggleVisibleTree(m_selected, 0, false);
+                               }
                        }
                }
                return true;