From 72509fbe10eb9342b9cde1fb30edb0f3ab9975b7 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 23 Jul 2024 12:48:37 +0200 Subject: [PATCH] WebAssembly: Simplify initial settings UI update This removes the need for a delayed call of WebAssemblySettings::updateStatus(), and a possible visual glitch where too many widgets are visible for a split sencond. Change-Id: I2b4b39f6576d16d4fde6b3e3df1ce09e6805086d Reviewed-by: Marcus Tillmanns --- src/plugins/webassembly/webassemblysettings.cpp | 9 ++------- src/plugins/webassembly/webassemblysettings.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/webassembly/webassemblysettings.cpp b/src/plugins/webassembly/webassemblysettings.cpp index 74e4f65b842..b33d41ba570 100644 --- a/src/plugins/webassembly/webassemblysettings.cpp +++ b/src/plugins/webassembly/webassemblysettings.cpp @@ -103,7 +103,6 @@ WebAssemblySettings::WebAssemblySettings() }, Group { title(Tr::tr("Emscripten SDK environment:")), - bindTo(&m_emSdkEnvGroupBox), Column { m_emSdkEnvDisplay, }, @@ -115,9 +114,7 @@ WebAssemblySettings::WebAssemblySettings() connect(emSdk.pathChooser(), &Utils::PathChooser::textChanged, this, &WebAssemblySettings::updateStatus); - // updateStatus() uses m_emSdkEnvGroupBox which only exists - // after this here emerges. So delay the update a bit. - QTimer::singleShot(0, this, &WebAssemblySettings::updateStatus); + updateStatus(); return col; }); @@ -132,10 +129,8 @@ void WebAssemblySettings::updateStatus() const Utils::FilePath newEmSdk = emSdk.pathChooser()->filePath(); const bool sdkValid = newEmSdk.exists() && WebAssemblyEmSdk::isValid(newEmSdk); - QTC_ASSERT(m_emSdkVersionDisplay, return); - QTC_ASSERT(m_emSdkEnvGroupBox, return); m_emSdkVersionDisplay->setVisible(sdkValid); - m_emSdkEnvGroupBox->setEnabled(sdkValid); + m_emSdkEnvDisplay->setEnabled(sdkValid); if (sdkValid) { const QVersionNumber sdkVersion = WebAssemblyEmSdk::version(newEmSdk); diff --git a/src/plugins/webassembly/webassemblysettings.h b/src/plugins/webassembly/webassemblysettings.h index e607e57d8f6..c7169b6c821 100644 --- a/src/plugins/webassembly/webassemblysettings.h +++ b/src/plugins/webassembly/webassemblysettings.h @@ -21,7 +21,6 @@ public: Utils::FilePathAspect emSdk{this}; private: - QWidget *m_emSdkEnvGroupBox = nullptr; Utils::InfoLabel *m_emSdkVersionDisplay = nullptr; QTextBrowser *m_emSdkEnvDisplay = nullptr; Utils::InfoLabel *m_qtVersionDisplay = nullptr;