mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 00:48:30 +00:00
Fix nearby chat hiding behaviour and default deselect behaviour
This commit is contained in:
@@ -3326,7 +3326,7 @@
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>FSCloseChatOnReturnOnlyForNearbyChatControl</key>
|
||||
<map>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user