From d5cbb534f88de876bb80e83f5ead4ed572ed35df Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Aug 2010 20:21:19 +0000 Subject: [PATCH] Make VideoDisplay's size calculations slightly less convoluted. Originally committed to SVN as r4727. --- aegisub/src/video_display.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp index b16b2aae2..45acd303f 100644 --- a/aegisub/src/video_display.cpp +++ b/aegisub/src/video_display.cpp @@ -402,13 +402,9 @@ void VideoDisplay::UpdateSize() { viewport_width = w; viewport_height = h; - // Sizers ignore SetClientSize/SetSize, so only use them to calculate - // what size is required after including the borders - SetClientSize(cw, ch); - GetSize(&cw, &ch); wxSize size(cw, ch); - SetMinSize(size); - SetMaxSize(size); + SetMinClientSize(size); + SetMaxClientSize(size); locked = true; box->VideoSizer->Fit(box);