Merge pull request #37317 from akien-mga/display-server-rebased

Separate DisplayServer from OS and add multiple windows support

1 files changed, 12 insertions, 27 deletions

diff --git a/scene/gui/popup.h b/scene/gui/popup.h
index ff472170b3..6cd2b4028f 100644
--- a/scene/gui/popup.h
+++ b/scene/gui/popup.h
@@ -31,44 +31,26 @@
 #ifndef POPUP_H
 #define POPUP_H
 
-#include "scene/gui/control.h"
+#include "scene/main/window.h"
 
-class Popup : public Control {
+class Popup : public Window {
 
-	GDCLASS(Popup, Control);
+	GDCLASS(Popup, Window);
 
-	bool exclusive;
-	bool popped_up;
+	Window *parent_visible;
 
-private:
-	void _popup(const Rect2 &p_bounds = Rect2(), const bool p_centered = false);
+	void _input_from_window(const Ref<InputEvent> &p_event);
+	void _parent_focused();
 
 protected:
-	virtual void _post_popup() {}
+	void _close_pressed();
+	virtual Rect2i _popup_adjust_rect() const;
 
-	void _gui_input(Ref<InputEvent> p_event);
 	void _notification(int p_what);
-	virtual void _fix_size();
 	static void _bind_methods();
 
 public:
-	enum {
-		NOTIFICATION_POST_POPUP = 80,
-		NOTIFICATION_POPUP_HIDE = 81
-	};
-
-	void set_exclusive(bool p_exclusive);
-	bool is_exclusive() const;
-
-	void popup_centered_ratio(float p_screen_ratio = 0.75);
-	void popup_centered(const Size2 &p_size = Size2());
-	void popup_centered_minsize(const Size2 &p_minsize = Size2());
 	void set_as_minsize();
-	void popup_centered_clamped(const Size2 &p_size = Size2(), float p_fallback_ratio = 0.75);
-	virtual void popup(const Rect2 &p_bounds = Rect2());
-
-	virtual String get_configuration_warning() const;
-
 	Popup();
 	~Popup();
 };
@@ -77,13 +59,16 @@ class PopupPanel : public Popup {
 
 	GDCLASS(PopupPanel, Popup);
 
+	Panel *panel;
+
 protected:
 	void _update_child_rects();
 	void _notification(int p_what);
 
+	virtual Size2 _get_contents_minimum_size() const;
+
 public:
 	void set_child_rect(Control *p_child);
-	virtual Size2 get_minimum_size() const;
 	PopupPanel();
 };