diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-11 01:47:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-11 01:47:06 +0000 |
| commit | 974d4a0bcdcb26ddb700d824e2deac32cfd171b1 (patch) | |
| tree | 7958c507dfa89cb42ae64124e380a269776cf6f4 /src/wx/timing_panel.cc | |
| parent | 0bab9b203ccd49c6d7a4536f1bbdb740f49ba65f (diff) | |
Put fade back into simple mode.v2.13.98
Diffstat (limited to 'src/wx/timing_panel.cc')
| -rw-r--r-- | src/wx/timing_panel.cc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index d47c81a15..7e7dd6fbd 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -169,12 +169,6 @@ TimingPanel::add_to_grid () _move_to_start_of_reel->Show (full); _full_length_label->Show (full); _full_length->Show (full); - _trim_start_label->Show (full); - _trim_start->Show (full); - _trim_start_to_playhead->Show (full); - _trim_end_label->Show (full); - _trim_end->Show (full); - _trim_end_to_playhead->Show (full); _play_length_label->Show (full); _play_length->Show (full); _video_frame_rate_label->Show (full); @@ -189,21 +183,23 @@ TimingPanel::add_to_grid () add_label_to_sizer (_grid, _full_length_label, true, wxGBPosition(r, 0)); _grid->Add (_full_length, wxGBPosition(r, 1)); ++r; + } - add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0)); - _grid->Add (_trim_start, wxGBPosition(r, 1)); - ++r; + add_label_to_sizer (_grid, _trim_start_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_start, wxGBPosition(r, 1)); + ++r; - _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1)); - ++r; + _grid->Add (_trim_start_to_playhead, wxGBPosition(r, 1)); + ++r; - add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0)); - _grid->Add (_trim_end, wxGBPosition(r, 1)); - ++r; + add_label_to_sizer (_grid, _trim_end_label, true, wxGBPosition(r, 0)); + _grid->Add (_trim_end, wxGBPosition(r, 1)); + ++r; - _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); - ++r; + _grid->Add (_trim_end_to_playhead, wxGBPosition(r, 1)); + ++r; + if (full) { add_label_to_sizer (_grid, _play_length_label, true, wxGBPosition(r, 0)); _grid->Add (_play_length, wxGBPosition(r, 1)); ++r; |