From 09ed7ac18e54357371b713bad768b079fe9fc869 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Wed, 6 Sep 2023 12:09:03 +0800 Subject: [PATCH] FIX: [STUDIO-4284] not set max height of liveview window Change-Id: Ie00e6c30d37b0a308123c5f425ebeaf961000da8 Jira: STUDIO-4284,STUDIO-4258 --- src/slic3r/GUI/MediaPlayCtrl.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index cb1c8b37c..031ae9a3a 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -641,20 +641,20 @@ void wxMediaCtrl2::DoSetSize(int x, int y, int width, int height, int sizeFlags) #else wxMediaCtrl::DoSetSize(x, y, width, height, sizeFlags); #endif - if (sizeFlags & wxSIZE_USE_EXISTING) return; - wxSize size = GetVideoSize(); - if (size.GetWidth() <= 0) - size = wxSize{16, 9}; - int maxHeight = (width * size.GetHeight() + size.GetHeight() - 1) / size.GetWidth(); - if (maxHeight != GetMaxHeight()) { - // BOOST_LOG_TRIVIAL(info) << "wxMediaCtrl2::DoSetSize: width: " << width << ", height: " << height << ", maxHeight: " << maxHeight; - SetMaxSize({-1, maxHeight}); - CallAfter([this] { - if (auto p = GetParent()) { - p->Layout(); - p->Refresh(); - } - }); - } + //if (sizeFlags & wxSIZE_USE_EXISTING) return; + //wxSize size = GetVideoSize(); + //if (size.GetWidth() <= 0) + // size = wxSize{16, 9}; + //int maxHeight = (width * size.GetHeight() + size.GetHeight() - 1) / size.GetWidth(); + //if (maxHeight != GetMaxHeight()) { + // // BOOST_LOG_TRIVIAL(info) << "wxMediaCtrl2::DoSetSize: width: " << width << ", height: " << height << ", maxHeight: " << maxHeight; + // SetMaxSize({-1, maxHeight}); + // CallAfter([this] { + // if (auto p = GetParent()) { + // p->Layout(); + // p->Refresh(); + // } + // }); + //} }