From b2655260fa139af114e96d6dcf1dcc35e80a7efb Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Mon, 24 May 2021 01:42:04 -0400
Subject: pull out chat list into a separate component

---
 components/chatwindow.hpp | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'components/chatwindow.hpp')

diff --git a/components/chatwindow.hpp b/components/chatwindow.hpp
index 1226d7e..db3d2fc 100644
--- a/components/chatwindow.hpp
+++ b/components/chatwindow.hpp
@@ -10,6 +10,7 @@ class ChatMessageItemContainer;
 class ChatInput;
 class ChatInputIndicator;
 class RateLimitIndicator;
+class ChatList;
 class ChatWindow {
 public:
     ChatWindow();
@@ -29,19 +30,12 @@ public:
     void UpdateReactions(Snowflake id);
 
 protected:
-    ChatMessageItemContainer *CreateMessageComponent(Snowflake id); // to be inserted into header's content box
-    void ProcessNewMessage(Snowflake id, bool prepend);             // creates and adds components
-
     bool m_is_replying = false;
     Snowflake m_replying_to;
 
     void StartReplying(Snowflake message_id);
     void StopReplying();
 
-    int m_num_messages = 0;
-    int m_num_rows = 0;
-    std::map<Snowflake, Gtk::Widget *> m_id_to_widget;
-
     Snowflake m_active_channel;
 
     bool OnInputSubmit(const Glib::ustring &text);
@@ -49,16 +43,13 @@ protected:
     bool OnKeyPressEvent(GdkEventKey *e);
     void OnScrollEdgeOvershot(Gtk::PositionType pos);
 
-    void RemoveMessageAndHeader(Gtk::Widget *widget);
-
-    void ScrollToBottom();
-    bool m_should_scroll_to_bottom = true;
-
     void OnMessageSendFail(const std::string &nonce, float retry_after);
 
     Gtk::Box *m_main;
-    Gtk::ListBox *m_list;
-    Gtk::ScrolledWindow *m_scroll;
+    //Gtk::ListBox *m_list;
+    //Gtk::ScrolledWindow *m_scroll;
+
+    ChatList *m_chat;
 
     ChatInput *m_input;
 
@@ -74,7 +65,6 @@ public:
     typedef sigc::signal<void, Snowflake> type_signal_action_chat_load_history;
     typedef sigc::signal<void, Snowflake> type_signal_action_channel_click;
     typedef sigc::signal<void, Snowflake> type_signal_action_insert_mention;
-    typedef sigc::signal<void, const GdkEvent *, Snowflake, Snowflake> type_signal_action_open_user_menu;
     typedef sigc::signal<void, Snowflake, Glib::ustring> type_signal_action_reaction_add;
     typedef sigc::signal<void, Snowflake, Glib::ustring> type_signal_action_reaction_remove;
 
@@ -84,7 +74,6 @@ public:
     type_signal_action_chat_load_history signal_action_chat_load_history();
     type_signal_action_channel_click signal_action_channel_click();
     type_signal_action_insert_mention signal_action_insert_mention();
-    type_signal_action_open_user_menu signal_action_open_user_menu();
     type_signal_action_reaction_add signal_action_reaction_add();
     type_signal_action_reaction_remove signal_action_reaction_remove();
 
@@ -95,7 +84,6 @@ private:
     type_signal_action_chat_load_history m_signal_action_chat_load_history;
     type_signal_action_channel_click m_signal_action_channel_click;
     type_signal_action_insert_mention m_signal_action_insert_mention;
-    type_signal_action_open_user_menu m_signal_action_open_user_menu;
     type_signal_action_reaction_add m_signal_action_reaction_add;
     type_signal_action_reaction_remove m_signal_action_reaction_remove;
 };
-- 
cgit v1.2.3