diff options
| author | Mateo Kuruk Miccino <mateomiccino@gmail.com> | 2020-03-12 20:12:34 -0300 |
|---|---|---|
| committer | Mateo Kuruk Miccino <mateomiccino@gmail.com> | 2020-03-26 15:49:54 +0100 |
| commit | f387b9b4f4ef3ae6eba5199b4089ef591f2d7ba2 (patch) | |
| tree | e9551e973d3b534c769279bba2ad58c7d991d2bf /modules/mono/editor | |
| parent | 9a5d15a2dcb08aa9f3732a0e8e41f2e81c2be365 (diff) | |
Multiple changes to DisplayServerX11
- Travis: Change x11 to linuxbsd
- SCons: Change x11 plataform to linuxbsd
- Plugins: Remove ; to avoid fallthrough warning
- DisplayServerX11: Implement set_icon
- DisplayServerX11: Fix X11 bug when a window was erased from windows
map, all the changes from that erased windows are sending to the main
window
- DisplayServerX11: Reorder create_window commands
- DisplayServerX11: Change every Size2 to Size2i and Rect2 to Rect2i
where it belongs
+ More X11 fixes which have been integrated directly back into reduz's
original commits while rebasing the branch.
Diffstat (limited to 'modules/mono/editor')
| -rw-r--r-- | modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs index 279e67b3eb..11a4109d97 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs @@ -33,7 +33,7 @@ namespace GodotTools.Utils { public const string Windows = "windows"; public const string OSX = "osx"; - public const string X11 = "x11"; + public const string X11 = "linuxbsd"; public const string Server = "server"; public const string UWP = "uwp"; public const string Haiku = "haiku"; |