[Web & Android] Hide more export options dynamically

Author: adamscott

platform/android/export/export_plugin.cpp

@@ -2175,6 +2175,12 @@ bool EditorExportPlatformAndroid::get_export_option_visibility(const EditorExpor
 		return true;
 	}
 
+	if (p_option == "gradle_build/export_format" ||
+			p_option == "gradle_build/min_sdk" ||
+			p_option == "gradle_build/target_sdk") {
+		return p_preset->get("gradle_build/use_gradle_build").operator bool();
+	}
+
 	bool advanced_options_enabled = p_preset->are_advanced_options_enabled();
 	if (p_option == "graphics/opengl_debug" ||
 			p_option == "gradle_build/custom_theme_attributes" ||
@@ -2229,9 +2235,16 @@ bool EditorExportPlatformAndroid::should_update_export_options() {
 	if (android_plugins_changed.is_set()) {
 		// don't clear unless we're reporting true, to avoid race
 		android_plugins_changed.clear();
+		_should_update_export_options = false;
 		return true;
 	}
 #endif // DISABLE_DEPRECATED
+
+	if (_should_update_export_options) {
+		_should_update_export_options = false;
+		return true;
+	}
+
 	return false;
 }
 

platform/android/export/export_plugin.h

@@ -83,6 +83,8 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 		String version;
 	};
 
+	bool _should_update_export_options = false;
+
 #ifndef DISABLE_DEPRECATED
 	mutable Vector<PluginConfigAndroid> android_plugins;
 	mutable SafeFlag android_plugins_changed;
@@ -274,6 +276,12 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 
 	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, HashSet<String> &p_features) override;
 
+	virtual void export_option_set(const String &p_edited_property) override {
+		if (p_edited_property == "gradle_build/use_gradle_build") {
+			_should_update_export_options = true;
+		}
+	}
+
 	EditorExportPlatformAndroid();
 
 	~EditorExportPlatformAndroid();

platform/web/export/export_plugin.cpp

@@ -396,6 +396,16 @@ bool EditorExportPlatformWeb::get_export_option_visibility(const EditorExportPre
 	if (p_option == "threads/godot_pool_size" || p_option == "threads/emscripten_pool_size") {
 		return p_preset->get("variant/thread_support").operator bool();
 	}
+	if (p_option == "progressive_web_app/ensure_cross_origin_isolation_headers" ||
+			p_option == "progressive_web_app/offline_page" ||
+			p_option == "progressive_web_app/display" ||
+			p_option == "progressive_web_app/orientation" ||
+			p_option == "progressive_web_app/icon_144x144" ||
+			p_option == "progressive_web_app/icon_180x180" ||
+			p_option == "progressive_web_app/icon_512x512" ||
+			p_option == "progressive_web_app/background_color") {
+		return p_preset->get("progressive_web_app/enabled").operator bool();
+	}
 
 	return true;
 }

platform/web/export/export_plugin.h

@@ -158,7 +158,7 @@ class EditorExportPlatformWeb : public EditorExportPlatform {
 	}
 
 	virtual void export_option_set(const String &p_edited_property) override {
-		_should_update_export_options = p_edited_property == "variant/thread_support";
+		_should_update_export_options = p_edited_property == "variant/thread_support" || "progressive_web_app/enabled";
 	}
 
 	String get_debug_protocol() const override { return "ws://"; }