diff --git a/rpcs3/Gui/ConLog.cpp b/rpcs3/Gui/ConLog.cpp index a77b486007..93d827717e 100644 --- a/rpcs3/Gui/ConLog.cpp +++ b/rpcs3/Gui/ConLog.cpp @@ -173,8 +173,9 @@ BEGIN_EVENT_TABLE(LogFrame, FrameBase) EVT_CLOSE(LogFrame::OnQuit) END_EVENT_TABLE() -LogFrame::LogFrame() - : FrameBase(nullptr, wxID_ANY, "Log Frame", "LogFrame", wxSize(600, 500)) +LogFrame::LogFrame(wxWindow *parent) + : FrameBase(nullptr, wxID_ANY, "Log Frame", "LogFrame", wxSize(600, 500), + wxPoint(parent->GetPosition().x + parent->GetSize().x, parent->GetPosition().y)) , ThreadBase("LogThread") , m_log(*new wxListView(this)) { @@ -183,6 +184,7 @@ LogFrame::LogFrame() wxMenu* menu_log_settings = new wxMenu(); menubar->Append(menu_log_settings, "Settings"); menu_log_settings->Append(id_log_level, "Log Level"); + SetMenuBar(menubar); //events @@ -274,8 +276,6 @@ void LogFrame::Settings(wxCommandEvent& WXUNUSED(event)) } wxDialog diag(this, wxID_ANY, "Settings", wxDefaultPosition); - static const u32 height = 400; - static const u32 width = 385; wxStaticBoxSizer* s_round_log_level = new wxStaticBoxSizer(wxVERTICAL, &diag, _("Log Level")); wxBoxSizer* s_panel = new wxBoxSizer(wxVERTICAL); diff --git a/rpcs3/Gui/ConLog.h b/rpcs3/Gui/ConLog.h index 90462a0bb1..678e76b5a4 100644 --- a/rpcs3/Gui/ConLog.h +++ b/rpcs3/Gui/ConLog.h @@ -23,7 +23,6 @@ public: return; std::string frmt = fmt::Format(fmt, std::forward(args)...); - WriteToLog("!", frmt, 2); } @@ -67,7 +66,7 @@ class LogFrame wxListView& m_log; public: - LogFrame(); + LogFrame(wxWindow *parent); ~LogFrame(); bool Close(bool force = false); diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 02626da024..efbde44432 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -103,7 +103,7 @@ MainFrame::MainFrame() // Panels m_game_viewer = new GameViewer(this); m_debugger_frame = new DebuggerPanel(this); - ConLogFrame = new LogFrame; + ConLogFrame = new LogFrame(this); AddPane(m_game_viewer, "Game List", wxAUI_DOCK_BOTTOM); AddPane(m_debugger_frame, "Debugger", wxAUI_DOCK_RIGHT);