From 5187b9f118bc8806c5ef89da4aa1ee9fb4e044ca Mon Sep 17 00:00:00 2001 From: Ade Novan Date: Mon, 24 Oct 2016 15:29:17 +0800 Subject: [PATCH] Add New Chat Counter --- Core/Config.h | 1 + Core/HLE/proAdhoc.cpp | 5 +++++ UI/ChatScreen.cpp | 1 + UI/EmuScreen.cpp | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Core/Config.h b/Core/Config.h index 381a1b954b..bc65c531cb 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -425,6 +425,7 @@ public: int iWlanAdhocChannel; bool bWlanPowerSave; bool bEnableNetworkChat; + int iNewChat; int iPSPModel; int iFirmwareVersion; diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index 4289bdcc56..87fdcabadf 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -1132,6 +1132,11 @@ int friendFinder(){ if (ch) { ch->UpdateChat(); } + else { + if (g_Config.iNewChat < 50) { + g_Config.iNewChat += 1; + } + } // Move RX Buffer memmove(rx, rx + sizeof(SceNetAdhocctlChatPacketS2C), sizeof(rx) - sizeof(SceNetAdhocctlChatPacketS2C)); diff --git a/UI/ChatScreen.cpp b/UI/ChatScreen.cpp index d42b4887e9..8504bb162d 100644 --- a/UI/ChatScreen.cpp +++ b/UI/ChatScreen.cpp @@ -56,6 +56,7 @@ void ChatMenu::CreateViews() { CreatePopupContents(box_); root_->SetDefaultFocusView(box_); + g_Config.iNewChat = 0; } void ChatMenu::dialogFinished(const Screen *dialog, DialogResult result) { diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 13a32b8aab..9b1eab79e6 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -779,7 +779,8 @@ void EmuScreen::CreateViews() { root_->Add(new Button("DevMenu"))->OnClick.Handle(this, &EmuScreen::OnDevTools); } if (g_Config.bEnableNetworkChat) { - root_->Add(new Button(sc->T("Chat"), new AnchorLayoutParams(50, NONE, NONE, 50, true)))->OnClick.Handle(this, &EmuScreen::OnChat); + //root_->Add(new Button(sc->T("Chat"), new AnchorLayoutParams(50, NONE, NONE, 50, true)))->OnClick.Handle(this, &EmuScreen::OnChat); + root_->Add(new ChoiceWithValueDisplay(&g_Config.iNewChat, sc->T("Chat"), new AnchorLayoutParams(130,WRAP_CONTENT,80, NONE, NONE, 50, true)))->OnClick.Handle(this, &EmuScreen::OnChat); } saveStatePreview_ = new AsyncImageFileView("", IS_FIXED, nullptr, new AnchorLayoutParams(bounds.centerX(), 100, NONE, NONE, true)); saveStatePreview_->SetFixedSize(160, 90);