From 89d664b6f78b8de3c37bb3055ba13e1488746893 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 19 Nov 2023 01:26:20 +0400 Subject: [PATCH] Use setFixedSize instead of set{Minimum,Maximum}Size combo --- ui/widgets/popup_menu.cpp | 3 +-- ui/widgets/separate_panel.cpp | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp index ad7f62d..9417959 100644 --- a/ui/widgets/popup_menu.cpp +++ b/ui/widgets/popup_menu.cpp @@ -384,8 +384,7 @@ void PopupMenu::handleMenuResize() { newWidth, _padding.top() + scrollHeight + _padding.bottom()); if (::Platform::IsMac()) { - setMaximumSize(newSize); - setMinimumSize(newSize); + setFixedSize(newSize); } resize(newSize); } diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp index e912181..fc173c4 100644 --- a/ui/widgets/separate_panel.cpp +++ b/ui/widgets/separate_panel.cpp @@ -671,21 +671,15 @@ void SeparatePanel::initGeometry(QSize size) { const QRect initRect(QPoint(), size); return initRect.translated(center - initRect.center()).marginsAdded(_padding); }(); - setGeometry(rect); - setMinimumSize(rect.size()); - setMaximumSize(rect.size()); + move(rect.topLeft()); + setFixedSize(rect.size()); updateControlsGeometry(); } void SeparatePanel::updateGeometry(QSize size) { - const auto rect = QRect( - x(), - y(), + setFixedSize( _padding.left() + size.width() + _padding.right(), _padding.top() + size.height() + _padding.bottom()); - setGeometry(rect); - setMinimumSize(rect.size()); - setMaximumSize(rect.size()); updateControlsGeometry(); update(); }