From 13baf92a958e275368825b6a4bac799f15f424b6 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 16 Sep 2022 08:53:12 +0100 Subject: [PATCH] FramelessWindowResizer: Use minimumSizeHint and sizeHint, so it works with FlowLayout --- sdrgui/gui/framelesswindowresizer.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdrgui/gui/framelesswindowresizer.cpp b/sdrgui/gui/framelesswindowresizer.cpp index ff5e4a8b3..e08f87080 100644 --- a/sdrgui/gui/framelesswindowresizer.cpp +++ b/sdrgui/gui/framelesswindowresizer.cpp @@ -170,14 +170,15 @@ void FramelessWindowResizer::mouseMoveEvent(QMouseEvent* event) if (m_widget->layout()) { - minSize = m_widget->layout()->minimumSize(); + //minSize = m_widget->layout()->minimumSize(); maxSize = m_widget->layout()->maximumSize(); } else { - minSize = m_widget->minimumSize(); + //minSize = m_widget->minimumSize(); maxSize = m_widget->maximumSize(); } + minSize = m_widget->minimumSizeHint(); // Need to use minimumSizeHint for FlowLayout to work // Limit requested to size to allowed min/max QSize size = reqSize; @@ -186,12 +187,12 @@ void FramelessWindowResizer::mouseMoveEvent(QMouseEvent* event) // Prevent vertical expansion of vertically fixed widgets if (m_widget->sizePolicy().verticalPolicy() == QSizePolicy::Fixed) { - size.setHeight(m_widget->height()); + size.setHeight(m_widget->sizeHint().height()); } // Prevent horizontal expansion of horizontal fixed widgets if (m_widget->sizePolicy().horizontalPolicy() == QSizePolicy::Fixed) { - size.setWidth(m_widget->width()); + size.setWidth(m_widget->sizeHint().width()); } // Move