diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-30 10:34:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-30 10:34:24 +0100 |
| commit | 771ba62be4e59439bf1b8dd622502e51f6444145 (patch) | |
| tree | 0ffcaac48d1e4a547b47b1c2f25223c962ce8dd6 /src | |
| parent | 47dce56d3283c866c4057d0acb192f7942b53a9d (diff) | |
Add Cancel button to custom colour conversion dialogue (#880).
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/content_colour_conversion_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index 995e80f6b..badfb894f 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -51,7 +51,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND); overall_sizer->Add (_editor); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); + wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 0a8feadc8..8a8dbd181 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -414,9 +414,13 @@ VideoPanel::edit_colour_conversion_clicked () } ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ()); - d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion)); - d->ShowModal (); - vc.front()->video->set_colour_conversion (d->get ()); + d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion)); + if (d->ShowModal() == wxID_OK) { + vc.front()->video->set_colour_conversion (d->get ()); + } else { + /* Reset the colour conversion choice */ + film_content_changed (VideoContentProperty::COLOUR_CONVERSION); + } d->Destroy (); } |