Initial chat view toggle hotkey implementation (chat hides, but doesn't expand again)

Author: Motobug

Source/Core/Core/HotkeyManager.cpp

@@ -37,6 +37,8 @@ constexpr std::array<const char*, NUM_HOTKEYS> s_hotkey_labels{{
     _trans("Unlock Cursor"),
     _trans("Center Mouse"),
     _trans("Activate NetPlay Chat"),
+    _trans("Collapse NetPlay Chat"),
+    _trans("Expand NetPlay Chat"),
     _trans("Control NetPlay Golf Mode"),
 #ifdef USE_RETRO_ACHIEVEMENTS
     _trans("Open Achievements"),
@@ -452,6 +454,8 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
   set_key_expression(HK_VOLUME_DOWN, "DOWN");
   set_key_expression(HK_VOLUME_UP, "UP");
   set_key_expression(HK_ACTIVATE_CHAT, "T");
+  set_key_expression(HK_COLLAPSE_CHAT, "LEFT");
+  set_key_expression(HK_EXPAND_CHAT, "RIGHT");
 #ifdef _WIN32
   set_key_expression(HK_STOP, "ESCAPE");
   set_key_expression(HK_FULLSCREEN, hotkey_string({"Alt", "RETURN"}));

Source/Core/Core/HotkeyManager.h

@@ -31,6 +31,8 @@ enum Hotkey
   HK_UNLOCK_CURSOR,
   HK_CENTER_MOUSE,
   HK_ACTIVATE_CHAT,
+  HK_COLLAPSE_CHAT,
+  HK_EXPAND_CHAT,
   HK_REQUEST_GOLF_CONTROL,
 #ifdef USE_RETRO_ACHIEVEMENTS
   HK_OPEN_ACHIEVEMENTS,

Source/Core/DolphinQt/HotkeyScheduler.cpp

@@ -255,6 +255,12 @@ void HotkeyScheduler::Run()
       if (IsHotkey(HK_ACTIVATE_CHAT))
         emit ActivateChat();
 
+      if (IsHotkey(HK_COLLAPSE_CHAT))
+        emit CollapseChat();
+
+      if (IsHotkey(HK_EXPAND_CHAT))
+        emit ExpandChat();
+
       if (IsHotkey(HK_REQUEST_GOLF_CONTROL))
         emit RequestGolfControl();
 

Source/Core/DolphinQt/HotkeyScheduler.h

@@ -28,6 +28,8 @@ class HotkeyScheduler : public QObject
   void ExitHotkey();
   void UnlockCursor();
   void ActivateChat();
+  void CollapseChat();
+  void ExpandChat();
   void RequestGolfControl();
   void FullScreenHotkey();
   void StopHotkey();

Source/Core/DolphinQt/MainWindow.cpp

@@ -639,6 +639,8 @@ void MainWindow::ConnectHotkeys()
   connect(m_hotkey_scheduler, &HotkeyScheduler::UnlockCursor, this, &MainWindow::UnlockCursor);
   connect(m_hotkey_scheduler, &HotkeyScheduler::TogglePauseHotkey, this, &MainWindow::TogglePause);
   connect(m_hotkey_scheduler, &HotkeyScheduler::ActivateChat, this, &MainWindow::OnActivateChat);
+  connect(m_hotkey_scheduler, &HotkeyScheduler::CollapseChat, this, &MainWindow::OnCollapseChat);
+  connect(m_hotkey_scheduler, &HotkeyScheduler::ExpandChat, this, &MainWindow::OnExpandChat);
   connect(m_hotkey_scheduler, &HotkeyScheduler::RequestGolfControl, this,
           &MainWindow::OnRequestGolfControl);
   connect(m_hotkey_scheduler, &HotkeyScheduler::RefreshGameListHotkey, this,
@@ -2050,6 +2052,18 @@ void MainWindow::OnActivateChat()
     g_netplay_chat_ui->Activate();
 }
 
+void MainWindow::OnCollapseChat()
+{
+  if (g_netplay_chat_ui)
+    g_netplay_chat_ui->Collapse();
+}
+
+void MainWindow::OnExpandChat()
+{
+  if (g_netplay_chat_ui)
+    g_netplay_chat_ui->Expand();
+}
+
 void MainWindow::OnRequestGolfControl()
 {
   auto client = Settings::Instance().GetNetPlayClient();

Source/Core/DolphinQt/MainWindow.h

@@ -210,6 +210,8 @@ class MainWindow final : public QMainWindow
   void OnStopRecording();
   void OnExportRecording();
   void OnActivateChat();
+  void OnCollapseChat();
+  void OnExpandChat();
   void OnRequestGolfControl();
   void ShowTASInput();
 

Source/Core/VideoCommon/NetPlayChatUI.cpp

@@ -6,7 +6,7 @@
 #include <imgui.h>
 
 constexpr float DEFAULT_WINDOW_WIDTH = 220.0f;
-constexpr float DEFAULT_WINDOW_HEIGHT = 400.0f;
+constexpr float DEFAULT_WINDOW_HEIGHT = 220.0f;
 
 constexpr size_t MAX_BACKLOG_SIZE = 100;
 
@@ -23,7 +23,7 @@ void NetPlayChatUI::Display()
 {
   const float scale = ImGui::GetIO().DisplayFramebufferScale.x;
 
-  ImGui::SetNextWindowPos(ImVec2(10.0f * scale, 10.0f * scale), ImGuiCond_FirstUseEver);
+  ImGui::SetNextWindowPos(ImVec2(10.0f * scale, 40.0f * scale), ImGuiCond_FirstUseEver);
   ImGui::SetNextWindowSizeConstraints(
       ImVec2(DEFAULT_WINDOW_WIDTH * scale, DEFAULT_WINDOW_HEIGHT * scale),
       ImGui::GetIO().DisplaySize);
@@ -68,6 +68,18 @@ void NetPlayChatUI::Display()
     m_activate = false;
   }
 
+  if (m_collapse)
+  {
+    NetPlayChatUI::Collapse();
+    m_collapse = true;
+  }
+
+  if (m_expand)
+  {
+    NetPlayChatUI::Expand();
+    m_expand = true;
+  }
+
   ImGui::PopItemWidth();
 
   ImGui::SameLine();
@@ -110,3 +122,31 @@ void NetPlayChatUI::Activate()
   else
     m_activate = true;
 }
+
+void NetPlayChatUI::Collapse()
+{
+  if (!ImGui::IsWindowCollapsed())
+  {
+    ImGui::SetWindowCollapsed(true);
+    m_collapse = false;
+  }
+  else
+  {
+    ImGui::SetWindowCollapsed(false);
+    m_collapse = true;
+  }
+}
+
+void NetPlayChatUI::Expand()
+{
+  if (ImGui::IsWindowCollapsed())
+  {
+    ImGui::SetWindowCollapsed(false);
+    m_collapse = true;
+  }
+  else
+  {
+    ImGui::SetWindowCollapsed(true);
+    m_collapse = false;
+  }
+}

Source/Core/VideoCommon/NetPlayChatUI.h

@@ -22,11 +22,15 @@ class NetPlayChatUI
   void AppendChat(std::string message, Color color);
   void SendMessage();
   void Activate();
+  void Collapse();
+  void Expand();
 
 private:
   char m_message_buf[256] = {};
   bool m_scroll_to_bottom = false;
   bool m_activate = false;
+  bool m_collapse = false;
+  bool m_expand = true;
   bool m_is_scrolled_to_bottom = true;
 
   std::deque<std::pair<std::string, Color>> m_messages;