Really fix detached video, closes #853.
Originally committed to SVN as r3009.
This commit is contained in:
parent
6dc3015962
commit
f4939c082a
1 changed files with 6 additions and 2 deletions
|
@ -147,10 +147,14 @@ VideoBox::VideoBox(wxWindow *parent, bool isDetached)
|
||||||
videoBottomSizer->Add(AutoScroll,0,wxTOP|wxBOTTOM|wxALIGN_CENTER|wxEXPAND,2);
|
videoBottomSizer->Add(AutoScroll,0,wxTOP|wxBOTTOM|wxALIGN_CENTER|wxEXPAND,2);
|
||||||
videoBottomSizer->Add(VideoPosition,1,wxLEFT|wxALIGN_CENTER,5);
|
videoBottomSizer->Add(VideoPosition,1,wxLEFT|wxALIGN_CENTER,5);
|
||||||
videoBottomSizer->Add(VideoSubsPos,1,wxALIGN_CENTER,0);
|
videoBottomSizer->Add(VideoSubsPos,1,wxALIGN_CENTER,0);
|
||||||
|
|
||||||
|
// If we're detached we do want to fill out as much space we can.
|
||||||
|
// But if we're in the main window, the subs grid needs space more than us.
|
||||||
VideoSizer = new wxBoxSizer(wxVERTICAL);
|
VideoSizer = new wxBoxSizer(wxVERTICAL);
|
||||||
VideoSizer->Add(topSizer,0,wxEXPAND,0);
|
VideoSizer->Add(topSizer,isDetached?1:0,wxEXPAND,0);
|
||||||
VideoSizer->Add(videoSliderSizer,0,wxEXPAND,0);
|
VideoSizer->Add(videoSliderSizer,0,wxEXPAND,0);
|
||||||
VideoSizer->Add(videoBottomSizer,0,wxEXPAND,0);
|
VideoSizer->Add(videoBottomSizer,0,wxEXPAND,0);
|
||||||
|
if (!isDetached)
|
||||||
VideoSizer->AddStretchSpacer(1);
|
VideoSizer->AddStretchSpacer(1);
|
||||||
SetSizer(VideoSizer);
|
SetSizer(VideoSizer);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue