empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow resizing messages window

Browse source
This commit is contained in:
Ilari Liusvaara 2013-11-26 14:46:15 +02:00
parent 75a0f641f4
commit 4b9ae1fbb5
2 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/platform/wxwidgets/window_messages.hpp
View file

@ -13,8 +13,12 @@ public:
public:
panel(wxwin_messages* _parent, unsigned lines);
void on_paint(wxPaintEvent& e);
void on_resize(wxSizeEvent& e);
virtual wxSize DoGetBestSize() const;
private:
wxwin_messages* parent;
size_t ilines;
size_t line_separation;
};
wxwin_messages();
~wxwin_messages();

43
src/platform/wxwidgets/messages.cpp
View file

@ -12,17 +12,33 @@ wxwin_messages::panel::panel(wxwin_messages* _parent, unsigned lines)
parent = _parent;
wxMemoryDC d;
wxSize s = d.GetTextExtent(wxT("MMMMMM"));
SetMinSize(wxSize(12 * s.x, lines * s.y));
line_separation = s.y;
ilines = lines;
//wxSizer* dummy_pad = new wxBoxSizer(wxVERTICAL);
//SetSizer(dummy_pad);
//dummy_pad->Add(12 * s.x, lines * s.y);
this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxwin_messages::panel::on_paint), NULL, this);
this->Connect(wxEVT_SIZE, wxSizeEventHandler(wxwin_messages::panel::on_resize), NULL, this);
//Fit();
SetMinSize(wxSize(6 * s.x, 5 * s.y));
}
wxSize wxwin_messages::panel::DoGetBestSize() const
{
wxMemoryDC d;
wxSize s = d.GetTextExtent(wxT("MMMMMM"));
std::cerr << "Requesting " << 12 * s.x << "*" << ilines * s.y << std::endl;
return wxSize(12 * s.x, ilines * s.y);
}
wxwin_messages::wxwin_messages()
: wxFrame(NULL, wxID_ANY, wxT("lsnes: Messages"), wxDefaultPosition, wxSize(-1, -1),
wxMINIMIZE_BOX | wxCLOSE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
wxMINIMIZE_BOX | wxCLOSE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |
wxRESIZE_BORDER)
{
wxFlexGridSizer* top_s = new wxFlexGridSizer(3, 1, 0, 0);
top_s->Add(mpanel = new panel(this, MAXMESSAGES));
wxBoxSizer* top_s = new wxBoxSizer(wxVERTICAL);
SetSizer(top_s);
top_s->Add(mpanel = new panel(this, MAXMESSAGES), 1, wxEXPAND);
platform::msgbuf.set_max_window_size(MAXMESSAGES);
wxFlexGridSizer* buttons_s = new wxFlexGridSizer(1, 6, 0, 0);
@ -60,9 +76,14 @@ wxwin_messages::wxwin_messages()
top_s->Add(cmd_s, 0, wxGROW);
Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(wxwin_messages::on_close));
//Very nasty hack.
wxSize tmp = mpanel->GetMinSize();
mpanel->SetMinSize(mpanel->DoGetBestSize());
top_s->SetSizeHints(this);
SetSizer(top_s);
Fit();
wxSize tmp2 = GetClientSize();
mpanel->SetMinSize(tmp);
top_s->SetSizeHints(this);
SetClientSize(tmp2);
}
wxwin_messages::~wxwin_messages()
@ -91,6 +112,16 @@ void wxwin_messages::panel::on_paint(wxPaintEvent& e)
}
}
void wxwin_messages::panel::on_resize(wxSizeEvent& e)
{
wxSize newsize = e.GetSize();
size_t lines = newsize.y / line_separation;
if(lines < 1) lines = 1;
platform::msgbuf.set_max_window_size(lines);
Refresh();
e.Skip();
}
void wxwin_messages::on_close(wxCloseEvent& e)
{
if(wxwidgets_exiting)