summaryrefslogtreecommitdiff
path: root/src/wx/video_panel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-01-11 01:47:06 +0000
committerCarl Hetherington <cth@carlh.net>2019-01-11 01:47:06 +0000
commit974d4a0bcdcb26ddb700d824e2deac32cfd171b1 (patch)
tree7958c507dfa89cb42ae64124e380a269776cf6f4 /src/wx/video_panel.cc
parent0bab9b203ccd49c6d7a4536f1bbdb740f49ba65f (diff)
Put fade back into simple mode.v2.13.98
Diffstat (limited to 'src/wx/video_panel.cc')
-rw-r--r--src/wx/video_panel.cc18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 605d4ff68..6615215d5 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -244,10 +244,6 @@ VideoPanel::add_to_grid ()
_grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
r += 2;
- _fade_in_label->Show (full);
- _fade_in->Show (full);
- _fade_out_label->Show (full);
- _fade_out->Show (full);
_scale_to_label->Show (full);
_scale->show (full);
_filters_label->Show (full);
@@ -257,15 +253,15 @@ VideoPanel::add_to_grid ()
_colour_conversion->Show (full);
_edit_colour_conversion_button->Show (full);
- if (full) {
- add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
- _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
- ++r;
+ add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
+ _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
+ ++r;
- add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
- _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
- ++r;
+ add_label_to_sizer (_grid, _fade_out_label, true, wxGBPosition (r, 0));
+ _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3));
+ ++r;
+ if (full) {
add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
_scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
++r;