From: Kahrl Date: Sun, 18 Oct 2015 08:42:44 +0000 (+0200) Subject: Settings tab: don't autoscroll when toggling "Show technical names" X-Git-Tag: 0.4.14~595 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba9d7215ecc38b6a33e2984a600c13db203f6274;p=oweals%2Fminetest.git Settings tab: don't autoscroll when toggling "Show technical names" --- diff --git a/src/guiTable.cpp b/src/guiTable.cpp index b327782e2..8e8144af8 100644 --- 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 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