SystemMonitor: Wrap file descriptor and unveiled paths model into a S…

…ortingProxyModel
lanmonster · Sep 22, 2020 · 3bd6142 · 3bd6142
1 parent f910cdc
commit 3bd6142
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp
@@ -27,6 +27,7 @@
 #include "ProcessFileDescriptorMapWidget.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/SortingProxyModel.h>
 #include <LibGUI/TableView.h>
 
 ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget()
@@ -56,7 +57,8 @@ ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget()
  return object.get("can_write").to_bool() ? "Yes" : "No";
  });
 
- m_table_view->set_model(GUI::JsonArrayModel::create({}, move(pid_fds_fields)));
+ m_model = GUI::JsonArrayModel::create({}, move(pid_fds_fields));
+ m_table_view->set_model(GUI::SortingProxyModel::create(*m_model));
 }
 
 ProcessFileDescriptorMapWidget::~ProcessFileDescriptorMapWidget()
@@ -68,5 +70,5 @@ void ProcessFileDescriptorMapWidget::set_pid(pid_t pid)
  if (m_pid == pid)
  return;
  m_pid = pid;
- static_cast<GUI::JsonArrayModel*>(m_table_view->model())->set_json_path(String::format("/proc/%d/fds", m_pid));
+ m_model->set_json_path(String::format("/proc/%d/fds", m_pid));
 }
diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h
@@ -39,5 +39,6 @@ class ProcessFileDescriptorMapWidget final : public GUI::Widget {
  ProcessFileDescriptorMapWidget();
 
  RefPtr<GUI::TableView> m_table_view;
+ RefPtr<GUI::JsonArrayModel> m_model;
  pid_t m_pid { -1 };
 };
diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp
@@ -27,6 +27,7 @@
 #include "ProcessUnveiledPathsWidget.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/JsonArrayModel.h>
+#include <LibGUI/SortingProxyModel.h>
 #include <LibGUI/TableView.h>
 
 ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget()
@@ -38,7 +39,9 @@ ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget()
  Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields;
  pid_unveil_fields.empend("path", "Path", Gfx::TextAlignment::CenterLeft);
  pid_unveil_fields.empend("permissions", "Permissions", Gfx::TextAlignment::CenterLeft);
- m_table_view->set_model(GUI::JsonArrayModel::create({}, move(pid_unveil_fields)));
+
+ m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields));
+ m_table_view->set_model(GUI::SortingProxyModel::create(*m_model));
 }
 
 ProcessUnveiledPathsWidget::~ProcessUnveiledPathsWidget()
@@ -50,5 +53,5 @@ void ProcessUnveiledPathsWidget::set_pid(pid_t pid)
  if (m_pid == pid)
  return;
  m_pid = pid;
- static_cast<GUI::JsonArrayModel*>(m_table_view->model())->set_json_path(String::format("/proc/%d/unveil", m_pid));
+ m_model->set_json_path(String::format("/proc/%d/unveil", m_pid));
 }
diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h
@@ -39,5 +39,6 @@ class ProcessUnveiledPathsWidget final : public GUI::Widget {
  ProcessUnveiledPathsWidget();
 
  RefPtr<GUI::TableView> m_table_view;
+ RefPtr<GUI::JsonArrayModel> m_model;
  pid_t m_pid { -1 };
 };