From 5c52521a0a022e592189f93bcfe8b268ed1042e7 Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 23 May 2016 18:08:34 +0800 Subject: [PATCH] Display render on title frame (#1701) * Display render on title frame * Fix few typo * fix wrong condition --- rpcs3/Gui/GSFrame.cpp | 4 ++++ rpcs3/Gui/GSFrame.h | 1 + rpcs3/Gui/SettingsDialog.cpp | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rpcs3/Gui/GSFrame.cpp b/rpcs3/Gui/GSFrame.cpp index 81aa2e5686..4527e0908b 100644 --- a/rpcs3/Gui/GSFrame.cpp +++ b/rpcs3/Gui/GSFrame.cpp @@ -15,6 +15,7 @@ END_EVENT_TABLE() GSFrame::GSFrame(const wxString& title, int w, int h) : wxFrame(nullptr, wxID_ANY, "GSFrame[" + title + "]") { + m_render = title; SetIcon(wxGetApp().m_MainFrame->GetIcon()); SetClientSize(w, h); @@ -106,6 +107,9 @@ void GSFrame::flip(draw_context_t) { std::string title = fmt::format("FPS: %.2f", (double)m_frames / fps_t.GetElapsedTimeInSec()); + if (!m_render.empty()) + title += " | " + m_render; + if (!Emu.GetTitle().empty()) title += " | " + Emu.GetTitle(); diff --git a/rpcs3/Gui/GSFrame.h b/rpcs3/Gui/GSFrame.h index ff01b3d52f..50d6ecc588 100644 --- a/rpcs3/Gui/GSFrame.h +++ b/rpcs3/Gui/GSFrame.h @@ -5,6 +5,7 @@ class GSFrame : public wxFrame, public GSFrameBase { u64 m_frames = 0; + std::string m_render; public: GSFrame(const wxString& title, int w, int h); diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index e7e70e072a..6c3139874e 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(wxWindow* parent) // Graphics wxStaticBoxSizer* s_round_gs_render = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Render"); - wxStaticBoxSizer* s_round_gs_d3d_adapter = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "D3D Adaptater"); + wxStaticBoxSizer* s_round_gs_d3d_adapter = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "D3D Adapter"); wxStaticBoxSizer* s_round_gs_res = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Resolution"); wxStaticBoxSizer* s_round_gs_aspect = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Aspect ratio"); wxStaticBoxSizer* s_round_gs_frame_limit = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Frame limit"); @@ -292,7 +292,7 @@ SettingsDialog::SettingsDialog(wxWindow* parent) wxComboBox* cbox_sys_lang = new wxComboBox(p_system, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY); wxCheckBox* chbox_core_hook_stfunc = new wxCheckBox(p_core, wxID_ANY, "Hook static functions"); - wxCheckBox* chbox_core_load_liblv2 = new wxCheckBox(p_core, wxID_ANY, "Load liblv2.sprx"); + wxCheckBox* chbox_core_load_liblv2 = new wxCheckBox(p_core, wxID_ANY, "Load liblv2.sprx only"); wxCheckBox* chbox_vfs_enable_host_root = new wxCheckBox(p_system, wxID_ANY, "Enable /host_root/"); wxCheckBox* chbox_gs_log_prog = new wxCheckBox(p_graphics, wxID_ANY, "Log shader programs"); wxCheckBox* chbox_gs_dump_depth = new wxCheckBox(p_graphics, wxID_ANY, "Write Depth Buffer");