Fix crash in TWidgetHelper::show/hideChildren.

desktop-app · Nov 1, 2021 · 402b73f · 402b73f
1 parent d9953c2
commit 402b73f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
@@ -12,6 +12,30 @@
 #include <QtGui/QtEvents>
 
 namespace Ui {
+namespace {
+
+[[nodiscard]] std::vector<QPointer<QWidget>> GetChildWidgets(
+		not_null<QWidget*> widget) {
+	const auto &children = widget->children();
+	auto result = std::vector<QPointer<QWidget>>();
+	result.reserve(children.size());
+	for (const auto child : children) {
+		if (child && child->isWidgetType()) {
+			result.push_back(static_cast<QWidget*>(child));
+		}
+	}
+	return result;
+}
+
+} // namespace
+
+void ToggleChildrenVisibility(not_null<QWidget*> widget, bool visible) {
+	for (const auto &child : GetChildWidgets(widget)) {
+		if (child) {
+			child->setVisible(visible);
+		}
+	}
+}
 
 void ResizeFitChild(
 		not_null<RpWidget*> parent,

diff --git a/ui/rp_widget.h b/ui/rp_widget.h
@@ -18,6 +18,12 @@
 #include <QtCore/QPointer>
 #include <QtGui/QtEvents>
 
+namespace Ui {
+
+void ToggleChildrenVisibility(not_null<QWidget*> widget, bool visible);
+
+} // namespace Ui
+
 class TWidget;
 
 template <typename Base>
@@ -30,18 +36,10 @@ class TWidgetHelper : public Base {
 	}
 
 	void hideChildren() {
-		for (auto child : Base::children()) {
-			if (child->isWidgetType()) {
-				static_cast<QWidget*>(child)->hide();
-			}
-		}
+		Ui::ToggleChildrenVisibility(this, false);
 	}
 	void showChildren() {
-		for (auto child : Base::children()) {
-			if (child->isWidgetType()) {
-				static_cast<QWidget*>(child)->show();
-			}
-		}
+		Ui::ToggleChildrenVisibility(this, true);
 	}
 
 	void moveToLeft(int x, int y, int outerw = 0) {