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

Movie editor: Allow changing window size

Browse source
This commit is contained in:
Ilari Liusvaara 2013-02-04 20:08:00 +02:00
parent 590b7fb927
commit 4a1838427e
1 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/platform/wxwidgets/editor-movie.cpp
View file

@ -20,14 +20,15 @@ enum
{ {
wxID_TOGGLE = wxID_HIGHEST + 1, wxID_TOGGLE = wxID_HIGHEST + 1,
wxID_CHANGE, wxID_CHANGE,
wxID_APPEND_FRAME wxID_APPEND_FRAME,
wxID_CHANGE_LINECOUNT
}; };
void update_movie_state(); void update_movie_state();
namespace namespace
{ {
const unsigned lines_to_display = 28; unsigned lines_to_display = 28;
uint64_t divs[] = {1000000, 100000, 10000, 1000, 100, 10, 1}; uint64_t divs[] = {1000000, 100000, 10000, 1000, 100, 10, 1};
uint64_t divsl[] = {1000000, 100000, 10000, 1000, 100, 10, 0}; uint64_t divsl[] = {1000000, 100000, 10000, 1000, 100, 10, 0};
const unsigned divcnt = sizeof(divs)/sizeof(divs[0]); const unsigned divcnt = sizeof(divs)/sizeof(divs[0]);
@ -369,6 +370,7 @@ private:
int movielines; int movielines;
int moviepos; int moviepos;
unsigned new_width; unsigned new_width;
unsigned new_height;
std::vector<uint8_t> pixels; std::vector<uint8_t> pixels;
int scroll_delta; int scroll_delta;
unsigned press_x; unsigned press_x;
@ -416,6 +418,7 @@ wxeditor_movie::_moviepanel::_moviepanel(wxeditor_movie* v)
m = v; m = v;
Connect(wxEVT_PAINT, wxPaintEventHandler(_moviepanel::on_paint), NULL, this); Connect(wxEVT_PAINT, wxPaintEventHandler(_moviepanel::on_paint), NULL, this);
new_width = 0; new_width = 0;
new_height = 0;
moviepos = 0; moviepos = 0;
scroll_delta = 0; scroll_delta = 0;
spos = 0; spos = 0;
@ -713,6 +716,22 @@ void wxeditor_movie::_moviepanel::on_popup_menu(wxCommandEvent& e)
case wxID_APPEND_FRAME: case wxID_APPEND_FRAME:
do_append_frames(1); do_append_frames(1);
return; return;
case wxID_CHANGE_LINECOUNT:
try {
std::string text = pick_text(m, "Set number of lines", "Set number of lines visible:",
(stringfmt() << lines_to_display).str());
unsigned tmp = parse_value<unsigned>(text);
if(tmp < 1)
throw std::runtime_error("Value out of range");
lines_to_display = tmp;
} catch(canceled_exception& e) {
return;
} catch(std::exception& e) {
wxMessageBox(wxT("Invalid value"), _T("Error"), wxICON_EXCLAMATION | wxOK, m);
return;
}
signal_repaint();
return;
}; };
} }
@ -722,16 +741,16 @@ void wxeditor_movie::_moviepanel::on_mouse2(unsigned x, unsigned y, bool polarit
{ {
if(polarity) if(polarity)
return; return;
if(y < 3)
return;
if(!movb.get_movie().readonly_mode())
return;
press_x = x;
press_line = spos + y - 3;
wxMenu menu; wxMenu menu;
bool on_button = false; bool on_button = false;
bool on_axis = false; bool on_axis = false;
std::string title; std::string title;
if(y < 3)
goto outrange;
if(!movb.get_movie().readonly_mode())
goto outrange;
press_x = x;
press_line = spos + y - 3;
for(auto i : fcontrols.get_controlinfo()) { for(auto i : fcontrols.get_controlinfo()) {
unsigned off = divcnt + 1; unsigned off = divcnt + 1;
if(press_x >= i.position_left + off && press_x < i.position_left + i.reserved + off) { if(press_x >= i.position_left + off && press_x < i.position_left + i.reserved + off) {
@ -754,6 +773,8 @@ void wxeditor_movie::_moviepanel::on_mouse2(unsigned x, unsigned y, bool polarit
if(on_axis) if(on_axis)
menu.Append(wxID_CHANGE, wxT("Change " + title)); menu.Append(wxID_CHANGE, wxT("Change " + title));
menu.Append(wxID_APPEND_FRAME, wxT("Append frame")); menu.Append(wxID_APPEND_FRAME, wxT("Append frame"));
outrange:
menu.Append(wxID_CHANGE_LINECOUNT, wxT("Change number of lines visible"));
menu.Connect(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(wxeditor_movie::_moviepanel::on_popup_menu), menu.Connect(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(wxeditor_movie::_moviepanel::on_popup_menu),
NULL, this); NULL, this);
PopupMenu(&menu); PopupMenu(&menu);
@ -771,9 +792,9 @@ void wxeditor_movie::_moviepanel::signal_repaint()
return; return;
auto s = m->get_scroll(); auto s = m->get_scroll();
requested = true; requested = true;
int lines, width; int lines, width, height;
wxeditor_movie* m2 = m; wxeditor_movie* m2 = m;
runemufn([&lines, &width, m2, this]() { runemufn([&lines, &width, &height, m2, this]() {
lines = this->get_lines(); lines = this->get_lines();
if(lines < lines_to_display) if(lines < lines_to_display)
this->moviepos = 0; this->moviepos = 0;
@ -782,15 +803,18 @@ void wxeditor_movie::_moviepanel::signal_repaint()
this->render(fb, moviepos); this->render(fb, moviepos);
auto x = fb.get_characters(); auto x = fb.get_characters();
width = x.first; width = x.first;
height = x.second;
}); });
int prev_width = new_width; int prev_width = new_width;
int prev_height = new_height;
new_width = width; new_width = width;
new_height = height;
if(s) if(s)
s->SetScrollbar(moviepos, lines_to_display, lines, lines_to_display - 1); s->SetScrollbar(moviepos, lines_to_display, lines, lines_to_display - 1);
auto size = fb.get_pixels(); auto size = fb.get_pixels();
pixels.resize(size.first * size.second * 3); pixels.resize(size.first * size.second * 3);
fb.render((char*)&pixels[0]); fb.render((char*)&pixels[0]);
if(prev_width != new_width) { if(prev_width != new_width || prev_height != new_height) {
auto cell = fb.get_cell(); auto cell = fb.get_cell();
SetMinSize(wxSize(new_width * cell.first, (lines_to_display + 3) * cell.second)); SetMinSize(wxSize(new_width * cell.first, (lines_to_display + 3) * cell.second));
if(new_width > 0 && s) if(new_width > 0 && s)