Code modernization: src/m* (part 3)

[dragonfireclient.git] / src / guiTable.cpp

diff --git a/src/guiTable.cpp b/src/guiTable.cpp
index ed5b0d87b0e07ee27d1fd2a276fcd00354a8fb8a..ab6de9435d5cd245d6fd4acc492a9efd6dac63fb 100644 (file)
--- a/src/guiTable.cpp
+++ b/src/guiTable.cpp
@@ -22,10 +22,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <queue>
 #include <sstream>
 #include <utility>
-#include <string.h>
+#include <cstring>
 #include <IGUISkin.h>
 #include <IGUIFont.h>
 #include <IGUIScrollBar.h>
+#include "client/renderingengine.h"
 #include "debug.h"
 #include "log.h"
 #include "client/tile.h"
@@ -47,22 +48,7 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
                ISimpleTextureSource *tsrc
 ):
        gui::IGUIElement(gui::EGUIET_ELEMENT, env, parent, id, rectangle),
-       m_tsrc(tsrc),
-       m_is_textlist(false),
-       m_has_tree_column(false),
-       m_selected(-1),
-       m_sel_column(0),
-       m_sel_doubleclick(false),
-       m_keynav_time(0),
-       m_keynav_buffer(L""),
-       m_border(true),
-       m_color(255, 255, 255, 255),
-       m_background(255, 0, 0, 0),
-       m_highlight(255, 70, 100, 50),
-       m_highlight_text(255, 255, 255, 255),
-       m_rowheight(1),
-       m_font(NULL),
-       m_scrollbar(NULL)
+       m_tsrc(tsrc)
 {
        assert(tsrc != NULL);
 
@@ -94,7 +80,8 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
        updateAbsolutePosition();
 
        core::rect<s32> relative_rect = m_scrollbar->getRelativePosition();
-       s32 width = (relative_rect.getWidth()/(2.0/3.0)) * porting::getDisplayDensity() *
+       s32 width = (relative_rect.getWidth()/(2.0/3.0)) *
+                       RenderingEngine::getDisplayDensity() *
                        g_settings->getFloat("gui_scaling");
        m_scrollbar->setRelativePosition(core::rect<s32>(
                        relative_rect.LowerRightCorner.X-width,relative_rect.UpperLeftCorner.Y,
@@ -109,7 +96,7 @@ GUITable::~GUITable()
 
        if (m_font)
                m_font->drop();
-       
+
        m_scrollbar->remove();
 }
 
@@ -556,24 +543,44 @@ 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;
 
-       --index;
+       --index; // Switch from 1-based indexing to 0-based indexing
 
        s32 rowcount = m_rows.size();
-
-       if (index >= rowcount)
+       if (rowcount == 0 || index < 0) {
+               return;
+       } else if (index >= rowcount) {
                index = rowcount - 1;
-       while (index >= 0 && m_rows[index].visible_index < 0)
-               --index;
+       }
+
+       // If the selected row is not visible, open its ancestors to make it visible
+       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;
+               for (s32 j = index - 1; j >= 0; --j) {
+                       if (m_rows[j].indent < indent) {
+                               opened_trees.insert(j);
+                               indent = m_rows[j].indent;
+                       }
+               }
+               setOpenedTrees(opened_trees);
+       }
+
        if (index >= 0) {
                m_selected = m_rows[index].visible_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
@@ -596,11 +603,11 @@ void GUITable::setDynamicData(const DynamicData &dyndata)
        m_keynav_time = dyndata.keynav_time;
        m_keynav_buffer = dyndata.keynav_buffer;
 
-       m_scrollbar->setPos(dyndata.scrollpos);
-
        setSelected(dyndata.selected);
        m_sel_column = 0;
        m_sel_doubleclick = false;
+
+       m_scrollbar->setPos(dyndata.scrollpos);
 }
 
 const c8* GUITable::getTypeName() const
@@ -808,7 +815,7 @@ bool GUITable::OnEvent(const SEvent &event)
                }
                else if (event.KeyInput.PressedDown && event.KeyInput.Char) {
                        // change selection based on text as it is typed
-                       s32 now = getTimeMs();
+                       u64 now = porting::getTimeMs();
                        if (now - m_keynav_time >= 500)
                                m_keynav_buffer = L"";
                        m_keynav_time = now;
@@ -906,6 +913,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;
@@ -1091,7 +1103,9 @@ void GUITable::getOpenedTrees(std::set<s32> &opened_trees) const
 
 void GUITable::setOpenedTrees(const std::set<s32> &opened_trees)
 {
-       s32 old_selected = getSelected();
+       s32 old_selected = -1;
+       if (m_selected >= 0)
+               old_selected = m_visible_rows[m_selected];
 
        std::vector<s32> parents;
        std::vector<s32> closed_parents;
@@ -1143,7 +1157,9 @@ void GUITable::setOpenedTrees(const std::set<s32> &opened_trees)
 
        updateScrollBar();
 
-       setSelected(old_selected);
+       // m_selected must be updated since it is a visible row index
+       if (old_selected >= 0)
+               m_selected = m_rows[old_selected].visible_index;
 }
 
 void GUITable::openTree(s32 to_open)