archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 03:38:38 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display render on title frame (#1701)

Browse source 
* Display render on title frame

* Fix few typo

* fix wrong condition
This commit is contained in:
raven02 2016-05-23 18:08:34 +08:00 • committed by Ivan
parent 5aae9b5536
commit 5c52521a0a
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Gui/GSFrame.cpp
View file

@ -15,6 +15,7 @@ END_EVENT_TABLE()
GSFrame::GSFrame(const wxString& title, int w, int h) GSFrame::GSFrame(const wxString& title, int w, int h)
: wxFrame(nullptr, wxID_ANY, "GSFrame[" + title + "]") : wxFrame(nullptr, wxID_ANY, "GSFrame[" + title + "]")
{ {
m_render = title;
SetIcon(wxGetApp().m_MainFrame->GetIcon()); SetIcon(wxGetApp().m_MainFrame->GetIcon());
SetClientSize(w, h); 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()); std::string title = fmt::format("FPS: %.2f", (double)m_frames / fps_t.GetElapsedTimeInSec());
if (!m_render.empty())
title += " | " + m_render;
if (!Emu.GetTitle().empty()) if (!Emu.GetTitle().empty())
title += " | " + Emu.GetTitle(); title += " | " + Emu.GetTitle();

1
rpcs3/Gui/GSFrame.h
View file

@ -5,6 +5,7 @@
class GSFrame : public wxFrame, public GSFrameBase class GSFrame : public wxFrame, public GSFrameBase
{ {
u64 m_frames = 0; u64 m_frames = 0;
std::string m_render;
public: public:
GSFrame(const wxString& title, int w, int h); GSFrame(const wxString& title, int w, int h);

4
rpcs3/Gui/SettingsDialog.cpp
View file

@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(wxWindow* parent)
// Graphics // Graphics
wxStaticBoxSizer* s_round_gs_render = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Render"); 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_res = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Resolution");
wxStaticBoxSizer* s_round_gs_aspect = new wxStaticBoxSizer(wxVERTICAL, p_graphics, "Aspect ratio"); 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"); 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); 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_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_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_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"); wxCheckBox* chbox_gs_dump_depth = new wxCheckBox(p_graphics, wxID_ANY, "Write Depth Buffer");