From 5a6ed4e8eadf3af3d141b246f124d67b62a1357c Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 21 Feb 2023 12:13:36 -0500 Subject: add upstream 12.1 --- wx+/popup_dlg.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'wx+/popup_dlg.cpp') diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp index c30426cb..b5a194ad 100644 --- a/wx+/popup_dlg.cpp +++ b/wx+/popup_dlg.cpp @@ -13,10 +13,9 @@ #include "app_main.h" #include "bitmap_button.h" #include "no_flicker.h" -#include "font_size.h" +#include "window_layout.h" #include "image_resources.h" #include "popup_dlg_generated.h" -#include "std_button_layout.h" #include "taskbar.h" #include "window_tools.h" @@ -273,12 +272,17 @@ public: //set std order after button visibility was set setStandardButtonLayout(*bSizerStdButtons, stdBtns); - updateGui(); + GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() +#ifdef __WXGTK3__ + Show(); //GTK3 size calculation requires visible window: https://github.com/wxWidgets/wxWidgets/issues/16088 + Hide(); //avoid old position flash when Center() moves window (asynchronously?) +#endif Center(); //needs to be re-applied after a dialog size change! + Raise(); //[!] popup may be triggered by ffs_batch job running in the background! if (m_buttonAccept->IsEnabled()) -- cgit