Fix nearby chat hiding behaviour and default deselect behaviour

This commit is contained in:
Hecklezz
2026-04-24 03:59:41 +10:00
parent 7e46f7cab9
commit 7c839b0f21
2 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -3326,7 +3326,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>FSCloseChatOnReturnOnlyForNearbyChatControl</key>
<map>
+4 -4
View File
@@ -243,18 +243,18 @@ void FSNearbyChatControl::autohide(bool after_send)
if (isDefault())
{
const bool in_mouselook = gAgentCamera.cameraMouselook();
const bool closeChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn")
const bool show_interface_in_mouselook = gSavedSettings.getBOOL("FSShowInterfaceInMouselook");
const bool closeChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn")
&& !(!in_mouselook && gSavedSettings.getBOOL("FSCloseChatOnReturnInMouselook"));
const bool autohideChatBar = gSavedSettings.getBOOL("AutohideChatBar");
bool hide_chatbar = false;
if (closeChatOnReturn)
{
setFocus(false);
hide_chatbar = autohideChatBar;
}
if (hide_chatbar || (!after_send && autohideChatBar))
if ((!after_send || closeChatOnReturn) &&
((in_mouselook && !show_interface_in_mouselook) || autohideChatBar))
{
FSNearbyChat::instance().showDefaultChatBar(false);
}