diff options
| author | Yuri Roubinsky <chaosus89@gmail.com> | 2020-02-03 18:28:23 +0300 |
|---|---|---|
| committer | Mostafa Thabet <mostafamthabet1@gmail.com> | 2020-02-06 22:00:48 +0200 |
| commit | d9b39abbeb222011b27513accf8b502f0c697cd2 (patch) | |
| tree | e33281af21edf94455e4e9d878e6df4a7b551611 | |
| parent | e5cb4f03c554a48c6d0b400ad53d4fad933d4dc7 (diff) | |
| parent | 90f00c0813b8335605c81b5d5063922efe5519e3 (diff) | |
Fixed Grammer
| -rw-r--r-- | doc/classes/EditorInspector.xml | 2 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 7 | ||||
| -rw-r--r-- | platform/x11/os_x11.h | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/doc/classes/EditorInspector.xml b/doc/classes/EditorInspector.xml index 7834390247..61d240c1dc 100644 --- a/doc/classes/EditorInspector.xml +++ b/doc/classes/EditorInspector.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8" ?> <class name="EditorInspector" inherits="ScrollContainer" version="4.0"> <brief_description> + A tab used to edit properties of the selected node. </brief_description> <description> + The editor inspector is by default located on the right-hand side of the editor. It's used to edit the properties of the selected node. For example, you can select a node such as the Sprite2D then edit its transform through the inspector tool. The editor inspector is an essential tool in the game development workflow. </description> <tutorials> </tutorials> diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 8195006121..e40aa867f8 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1433,7 +1433,11 @@ void OS_X11::set_window_fullscreen(bool p_enabled) { // Restore set_window_maximized(false); } - + if (!p_enabled) { + set_window_position(last_position_before_fs); + } else { + last_position_before_fs = get_window_position(); + } current_videomode.fullscreen = p_enabled; } @@ -3502,4 +3506,5 @@ OS_X11::OS_X11() { window_focused = true; xim_style = 0L; mouse_mode = MOUSE_MODE_VISIBLE; + last_position_before_fs = Vector2(); } diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 01e5aac3df..25b406743b 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -115,6 +115,7 @@ class OS_X11 : public OS_Unix { // IME bool im_active; Vector2 im_position; + Vector2 last_position_before_fs; Size2 min_size; Size2 max_size; |