From 1d1c524b2caa6fad5db040f2735cfbd7766849ac Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 19 Nov 2023 01:23:55 +0400 Subject: [PATCH] Use setFixedSize for popup menu and tooltip --- ui/widgets/popup_menu.cpp | 5 +---- ui/widgets/tooltip.cpp | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp index 9417959..7e8ba2b 100644 --- a/ui/widgets/popup_menu.cpp +++ b/ui/widgets/popup_menu.cpp @@ -383,10 +383,7 @@ void PopupMenu::handleMenuResize() { const auto newSize = QSize( newWidth, _padding.top() + scrollHeight + _padding.bottom()); - if (::Platform::IsMac()) { - setFixedSize(newSize); - } - resize(newSize); + setFixedSize(newSize); } _inner = rect().marginsRemoved(_padding); } diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp index 317c6b3..f77f983 100644 --- a/ui/widgets/tooltip.cpp +++ b/ui/widgets/tooltip.cpp @@ -137,7 +137,8 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip * } } - setGeometry(QRect(p, s)); + move(p); + setFixedSize(s); _hideByLeaveTimer.cancel(); show(); @@ -234,7 +235,7 @@ void ImportantTooltip::resizeToContent() { if (size.width() < 2 * (_st.arrowSkipMin + _st.arrow)) { size.setWidth(2 * (_st.arrowSkipMin + _st.arrow)); } - resize(size); + setFixedSize(size); updateGeometry(); }