Fix chat scrolling

## Also - Fix ImGui::BeginChild signature (changed in 1.90) - Add spacing to prevent bottom of a char to be cropped (eg. letter "g")
MafiaHub · Jan 11, 2025 · f4edabe · f4edabe
1 parent b4dfb16
commit f4edabe
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/code/client/src/core/ui/chat.cpp b/code/client/src/core/ui/chat.cpp
@@ -14,34 +14,31 @@ namespace MafiaMP::Core::UI {
     void Chat::OnUpdate() {
         bool _wasFocused = _isFocused;
 
+        if (gApplication->GetInput()->IsKeyPressed(FW_KEY_RETURN) && !_isFocused) {
+            _isFocused = true;
+            LockControls(true);
+        }
+
         ImGui::SetNextWindowSize(ImVec2(400, 300));
         ImGui::SetNextWindowPos(ImVec2(20, 20));
-        ImGui::Begin("Chat", NULL, ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize);
+        ImGui::Begin("Chat", nullptr, ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize);
 
         {
-            ImGui::BeginChild("##scrolling", ImVec2(ImGui::GetWindowWidth() * 0.95f, ImGui::GetWindowHeight() * 0.80f), false, _isFocused ? 0 : ImGuiWindowFlags_NoScrollbar);
+            ImGui::BeginChild("##messages", ImVec2(ImGui::GetWindowWidth() * 0.95f, ImGui::GetWindowHeight() * 0.80f), 0, _isFocused ? 0 : ImGuiWindowFlags_NoScrollbar);
 
             if (!_chatMessages.empty()) {
                 for (const auto &msg : _chatMessages) {
                     ImGui::TextWrapped("%s", msg.c_str());
                 }
             }
 
+            ImGui::Spacing();
+
             if (_newMsgArrived) {
-                if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY()) {
-                    ImGui::SetScrollHereY(1.0f);
-                }
+                ImGui::SetScrollHereY(1.0f);
                 _newMsgArrived = false;
             }
 
-            if (gApplication->GetInput()->IsKeyPressed(FW_KEY_RETURN) && !_isFocused) {
-                _isFocused = true;
-                LockControls(true);
-                if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY()) {
-                    ImGui::SetScrollHereY(1.0f);
-                }
-            }
-
             ImGui::EndChild();
         }
 
@@ -95,10 +92,6 @@ namespace MafiaMP::Core::UI {
 
                 _isFocused = false;
                 LockControls(false);
-
-                if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY()) {
-                    ImGui::SetScrollHereY(1.0f);
-                }
             }
         }