From 220616e3e44f78111b368dc5366fe10cf2dbc88c Mon Sep 17 00:00:00 2001 From: vnctdj <3978690+vnctdj@users.noreply.github.com> Date: Sun, 8 Mar 2020 23:51:23 +0100 Subject: [PATCH] Enable chat input for SDL --- UI/ChatScreen.cpp | 6 +++--- UI/ChatScreen.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UI/ChatScreen.cpp b/UI/ChatScreen.cpp index ba15f03a94..6a57177606 100644 --- a/UI/ChatScreen.cpp +++ b/UI/ChatScreen.cpp @@ -20,7 +20,7 @@ void ChatMenu::CreatePopupContents(UI::ViewGroup *parent) { LinearLayout *outer = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT,400)); scroll_ = outer->Add(new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0))); LinearLayout *bottom = outer->Add(new LinearLayout(ORIENT_HORIZONTAL, new LayoutParams(FILL_PARENT, WRAP_CONTENT))); -#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) +#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(SDL) chatEdit_ = bottom->Add(new TextEdit("", n->T("Chat Here"), new LinearLayoutParams(1.0))); #if defined(USING_WIN_UI) //freeze the ui when using ctrl + C hotkey need workaround @@ -98,7 +98,7 @@ void ChatMenu::CreateViews() { box_->Add(title); CreatePopupContents(box_); -#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) +#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(SDL) UI::EnableFocusMovement(true); root_->SetDefaultFocusView(box_); box_->SubviewFocused(chatEdit_); @@ -120,7 +120,7 @@ void ChatMenu::dialogFinished(const Screen *dialog, DialogResult result) { } UI::EventReturn ChatMenu::OnSubmit(UI::EventParams &e) { -#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) +#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(SDL) std::string chat = chatEdit_->GetText(); chatEdit_->SetText(""); chatEdit_->SetFocus(); diff --git a/UI/ChatScreen.h b/UI/ChatScreen.h index 4470a27acd..ff67d8ce2c 100644 --- a/UI/ChatScreen.h +++ b/UI/ChatScreen.h @@ -25,7 +25,7 @@ private: UI::EventReturn OnQuickChat4(UI::EventParams &e); UI::EventReturn OnQuickChat5(UI::EventParams &e); -#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) +#if PPSSPP_PLATFORM(WINDOWS) || defined(USING_QT_UI) || defined(SDL) UI::TextEdit *chatEdit_ = nullptr; #endif UI::ScrollView *scroll_ = nullptr;