summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-31 11:56:58 +0200
committerRémi Verschelde <rverschelde@gmail.com>2020-03-31 11:56:58 +0200
commite5033d39523abd7bcf14b6d2886b659613cea78f (patch)
treeb4ce4cea5a18360fe97808c354d8764902741d4a /scene/main
parent0926c192e8cca7509ace4cf015c9a1dd529393f1 (diff)
doc: Sync classref with DisplayServer/Window changes
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/window.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/scene/main/window.h b/scene/main/window.h
index be07762f20..adaa5ca3be 100644
--- a/scene/main/window.h
+++ b/scene/main/window.h
@@ -43,7 +43,7 @@ public:
MODE_WINDOWED = DisplayServer::WINDOW_MODE_WINDOWED,
MODE_MINIMIZED = DisplayServer::WINDOW_MODE_MINIMIZED,
MODE_MAXIMIZED = DisplayServer::WINDOW_MODE_MAXIMIZED,
- MODE_FULLSCREEN = DisplayServer::WINDOW_MODE_FULLSCREEN
+ MODE_FULLSCREEN = DisplayServer::WINDOW_MODE_FULLSCREEN,
};
enum Flags {
@@ -59,7 +59,6 @@ public:
CONTENT_SCALE_MODE_DISABLED,
CONTENT_SCALE_MODE_OBJECTS,
CONTENT_SCALE_MODE_PIXELS,
-
};
enum ContentScaleAspect {
@@ -68,10 +67,10 @@ public:
CONTENT_SCALE_ASPECT_KEEP_WIDTH,
CONTENT_SCALE_ASPECT_KEEP_HEIGHT,
CONTENT_SCALE_ASPECT_EXPAND,
-
};
+
enum {
- DEFAULT_WINDOW_SIZE = 100
+ DEFAULT_WINDOW_SIZE = 100,
};
private:
@@ -258,8 +257,8 @@ public:
~Window();
};
-VARIANT_ENUM_CAST(Window::Window::Mode);
-VARIANT_ENUM_CAST(Window::Window::Flags);
+VARIANT_ENUM_CAST(Window::Mode);
+VARIANT_ENUM_CAST(Window::Flags);
VARIANT_ENUM_CAST(Window::ContentScaleMode);
VARIANT_ENUM_CAST(Window::ContentScaleAspect);