reapack

commit 36c863c700068cdcef55deec0508ca5a7158aaf4
parent b90184f9758388834d097289144c2fc1fffeec28
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Thu, 25 Aug 2016 01:34:26 -0400

refactoring – extract listview column auto resize code

Diffstat:
M
src/about.cpp
 | 
6
++----
M
src/listview.cpp
 | 
7
+++++++
M
src/listview.hpp
 | 
1
+
M
src/manager.cpp
 | 
4
+---
M
src/query.cpp
 | 
14
+++++++-------

5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/about.cpp b/src/about.cpp
@@ -116,10 +116,8 @@ void About::setDelegate(const DelegatePtr &delegate)
   m_currentIndex = -255;
   updateList();
 
-#ifdef LVSCW_AUTOSIZE_USEHEADER
-  m_menu->resizeColumn(m_menu->columnCount() - 1, LVSCW_AUTOSIZE_USEHEADER);
-  m_list->resizeColumn(m_list->columnCount() - 1, LVSCW_AUTOSIZE_USEHEADER);
-#endif
+  m_menu->autoSizeHeader();
+  m_list->autoSizeHeader();
 
 #ifdef _WIN32
   SendMessage(handle(), WM_SETREDRAW, true, 0);
diff --git a/src/listview.cpp b/src/listview.cpp
@@ -298,6 +298,13 @@ void ListView::setScroll(const int index)
 #endif
 }
 
+void ListView::autoSizeHeader()
+{
+#ifdef LVSCW_AUTOSIZE_USEHEADER
+  resizeColumn(columnCount() - 1, LVSCW_AUTOSIZE_USEHEADER);
+#endif
+}
+
 void ListView::onNotify(LPNMHDR info, LPARAM lParam)
 {
   switch(info->code) {
diff --git a/src/listview.hpp b/src/listview.hpp
@@ -68,6 +68,7 @@ public:
   int itemUnderMouse() const;
   int scroll() const;
   void setScroll(int);
+  void autoSizeHeader();
 
   void setSelected(int index, bool select);
   void select(int index) { setSelected(index, true); }
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -59,9 +59,7 @@ void Manager::onInit()
 
   refresh();
 
-#ifdef LVSCW_AUTOSIZE_USEHEADER
-  m_list->resizeColumn(m_list->columnCount() - 1, LVSCW_AUTOSIZE_USEHEADER);
-#endif
+  m_list->autoSizeHeader();
 }
 
 void Manager::onCommand(const int id, int)
diff --git a/src/query.cpp b/src/query.cpp
@@ -59,9 +59,7 @@ void ObsoleteQuery::onInit()
     m_list->addRow({make_autostring(stream.str())});
   }
 
-#ifdef LVSCW_AUTOSIZE_USEHEADER
-  m_list->resizeColumn(m_list->columnCount() - 1, LVSCW_AUTOSIZE_USEHEADER);
-#endif
+  m_list->autoSizeHeader();
 
   SendMessage(m_enableCtrl, BM_SETCHECK, BST_CHECKED, 0);
 
@@ -90,8 +88,10 @@ void ObsoleteQuery::onCommand(const int id, int event)
 
 void ObsoleteQuery::prepare()
 {
-    vector<Registry::Entry> selected;
-    for(int index : m_list->selection())
-      selected.emplace_back(m_entries->at(index));
-    m_entries->swap(selected);
+  vector<Registry::Entry> selected;
+
+  for(int index : m_list->selection())
+    selected.emplace_back(m_entries->at(index));
+
+  m_entries->swap(selected);
 }