Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rebased and fix the update scroll

Browse source
This commit is contained in:
Gde Made Novan Priambhada 2017-06-08 02:18:45 +08:00
parent 6706698d21
commit 97a4d6424f
4 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
UI/ChatScreen.cpp
View file

@ -58,6 +58,7 @@ void ChatMenu::CreateViews() {
float yres = screenManager()->getUIContext()->GetBounds().h;
switch (g_Config.iChatScreenPosition) {
// the chat screen size is still static 280,250 need a dynamic size based on device resolution
case 0:
box_ = new LinearLayout(ORIENT_VERTICAL, new AnchorLayoutParams(PopupWidth(), FillVertical() ? yres - 30 : WRAP_CONTENT, 280, NONE, NONE, 250, true));
break;
@ -87,16 +88,16 @@ void ChatMenu::CreateViews() {
CreatePopupContents(box_);
#if defined(_WIN32) || defined(USING_QT_UI)
//not work yet for tywald requests cant set the focus to chat edit after chat opened
root_->SetDefaultFocusView(box_);
box_->SubviewFocused(chatEdit_);
root_->SetFocus();
#else
root_->SetDefaultFocusView(box_);
#endif
UpdateChat();
chatScreenVisible = true;
newChat = 0;
UI::EnableFocusMovement(true);
UpdateChat();
}
void ChatMenu::dialogFinished(const Screen *dialog, DialogResult result) {
@ -115,13 +116,18 @@ UI::EventReturn ChatMenu::OnSubmit(UI::EventParams &e) {
return UI::EVENT_DONE;
}
/*
maximum chat length in one message from server is only 64 character
need to split the chat to fit the static chat screen size
if the chat screen size become dynamic from device resolution
we need to change split function logic also.
*/
std::vector<std::string> Split(const std::string& str)
{
std::vector<std::string> ret;
int counter = 0;
int firstSentenceEnd = 0;
int secondSentenceEnd = 0;
//NOTICE_LOG(HLE, "Splitted %s %i", str.c_str(),str.size());
for (auto i = 0; i<str.length(); i++) {
if (isspace(str[i])) {
if (i < 35) {
@ -153,8 +159,8 @@ void ChatMenu::UpdateChat() {
chatVert_->Clear(); //read Access violation is proadhoc.cpp use NULL_->Clear() pointer?
std::vector<std::string> chatLog = getChatLog();
for (auto i : chatLog) {
//split long text
if (i.length() > 30) {
//split long text
std::vector<std::string> splitted = Split(i);
for (auto j : splitted) {
TextView *v = chatVert_->Add(new TextView(j, FLAG_DYNAMIC_ASCII, false));
@ -185,17 +191,16 @@ bool ChatMenu::touch(const TouchInput &touch) {
return UIDialogScreen::touch(touch);
}
void ChatMenu::update(InputState &input) {
PopupScreen::update(input);
void ChatMenu::update() {
PopupScreen::update();
if (updateChatScreen) {
UpdateChat();
}
}
void ChatMenu::postRender() {
if (scroll_ && toBottom_) {
scroll_->ScrollToBottom();
toBottom_ = false;
else {
if (scroll_ && toBottom_) {
toBottom_ = false;
scroll_->ScrollToBottom();
}
}
}

5
UI/ChatScreen.h
View file

@ -4,14 +4,13 @@
class ChatMenu : public PopupScreen {
public:
ChatMenu() : PopupScreen("Chat") {}
ChatMenu() : PopupScreen("Chat") , toBottom_(false) {}
~ChatMenu();
void CreatePopupContents(UI::ViewGroup *parent) override;
void CreateViews() override;
void dialogFinished(const Screen *dialog, DialogResult result) override;
bool touch(const TouchInput &touch) override;
void update(InputState &input) override;
void postRender() override;
void update() override;
void UpdateChat();
private:
UI::EventReturn OnSubmit(UI::EventParams &e);

11
UI/EmuScreen.cpp
View file

@ -380,12 +380,16 @@ void EmuScreen::sendMessage(const char *message, const char *value) {
if (g_Config.bBypassOSKWithKeyboard) {
osm.Show("Disable windows native keyboard options to use ctrl + c hotkey", 2.0f);
} else {
if (g_Config.bEnableNetworkChat) {
chatButtons->SetVisibility(UI::V_GONE);
screenManager()->push(new ChatMenu());
}
}
#else
if (g_Config.bEnableNetworkChat) {
chatButtons->SetVisibility(UI::V_GONE);
screenManager()->push(new ChatMenu());
}
#else
chatButtons->SetVisibility(UI::V_GONE);
screenManager()->push(new ChatMenu());
#endif
}
}
@ -807,6 +811,7 @@ void EmuScreen::CreateViews() {
break;
case 3:
chatButtons = new ChoiceWithValueDisplay(&newChat, sc->T("Chat"), new AnchorLayoutParams(130, WRAP_CONTENT, 80, 50, NONE, NONE, true));
break;
case 4:
chatButtons = new ChoiceWithValueDisplay(&newChat, sc->T("Chat"), new AnchorLayoutParams(130, WRAP_CONTENT, bounds.centerX(), 50, NONE, NONE, true));
break;

2
Windows/resource.h
View file

@ -334,7 +334,7 @@
#define ID_FILE_DUMPAUDIO 40167
#define ID_HELP_GITHUB 40168
#define IDC_GEDBG_RECORD 40169
#define ID_EMULATION_CHAT 40168
#define ID_EMULATION_CHAT 40170
// Dummy option to let the buffered rendering hotkey cycle through all the options.