Commit 76f22c11 authored by Clément Stenac's avatar Clément Stenac

Allow resizing of video when autofit is enabled

parent 5e0dd9dd
...@@ -694,11 +694,24 @@ void Interface::ShowSlider(bool show, bool layout) ...@@ -694,11 +694,24 @@ void Interface::ShowSlider(bool show, bool layout)
m_slider_timer.Stop(); m_slider_timer.Stop();
m_controls_timer.Stop(); m_controls_timer.Stop();
//prevent continuous layout
if (slider_frame->IsShown())
{
return;
}
slider_frame->Show(); slider_frame->Show();
frame_sizer->Show( slider_frame ); frame_sizer->Show( slider_frame );
} }
else else
{ {
//prevent continuous layout
if (!slider_frame->IsShown())
{
return;
}
slider_frame->Hide(); slider_frame->Hide();
frame_sizer->Hide( slider_frame ); frame_sizer->Hide( slider_frame );
} }
...@@ -727,11 +740,24 @@ void Interface::ShowDiscFrame(bool show, bool layout) ...@@ -727,11 +740,24 @@ void Interface::ShowDiscFrame(bool show, bool layout)
//prevent the hide timer from hiding it now //prevent the hide timer from hiding it now
m_controls_timer.Stop(); m_controls_timer.Stop();
//prevent continuous layout
if (disc_frame->IsShown())
{
return;
}
disc_frame->Show(); disc_frame->Show();
slider_sizer->Show( disc_frame ); slider_sizer->Show( disc_frame );
} }
else else
{ {
//prevent continuous layout
if (!disc_frame->IsShown())
{
return;
}
disc_frame->Hide(); disc_frame->Hide();
slider_sizer->Hide( disc_frame ); slider_sizer->Hide( disc_frame );
} }
...@@ -763,6 +789,7 @@ void Interface::OnControlsTimer(wxTimerEvent& WXUNUSED(event)) ...@@ -763,6 +789,7 @@ void Interface::OnControlsTimer(wxTimerEvent& WXUNUSED(event))
if (size_to_video) if (size_to_video)
{ {
slider_sizer->Fit( slider_frame ); slider_sizer->Fit( slider_frame );
frame_sizer->Fit( this );
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment