mirror of https://github.com/odrling/Aegisub
Fix infinite loop when opening video with wxgtk
Originally committed to SVN as r5954.
This commit is contained in:
parent
90582c0b15
commit
d6ba00883e
|
@ -312,19 +312,22 @@ void VideoDisplay::UpdateSize(int arType, double arValue) {
|
||||||
viewport_height = h;
|
viewport_height = h;
|
||||||
|
|
||||||
wxSize size(cw, ch);
|
wxSize size(cw, ch);
|
||||||
|
if (size != GetClientSize()) {
|
||||||
SetMinClientSize(size);
|
SetMinClientSize(size);
|
||||||
SetMaxClientSize(size);
|
SetMaxClientSize(size);
|
||||||
|
|
||||||
SetEvtHandlerEnabled(false);
|
SetEvtHandlerEnabled(false);
|
||||||
GetGrandParent()->Layout();
|
GetGrandParent()->Layout();
|
||||||
|
|
||||||
// The sizer makes us use the full width, which at very low zoom levels
|
// The sizer makes us use the full width, which at very low zoom
|
||||||
// results in stretched video, so after using the sizer to update the
|
// levels results in stretched video, so after using the sizer to
|
||||||
// parent window sizes, reset our size to the correct value
|
// update the parent window sizes, reset our size to the correct
|
||||||
|
// value
|
||||||
SetSize(cw, ch);
|
SetSize(cw, ch);
|
||||||
|
|
||||||
SetEvtHandlerEnabled(true);
|
SetEvtHandlerEnabled(true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (tool.get())
|
if (tool.get())
|
||||||
tool->SetDisplayArea(viewport_left, viewport_top, viewport_width, viewport_height);
|
tool->SetDisplayArea(viewport_left, viewport_top, viewport_width, viewport_height);
|
||||||
|
|
Loading…
Reference in New Issue