Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
516b3bb8
Commit
516b3bb8
authored
Apr 01, 2020
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Clang warnings on Windows
Fixes #37490.
parent
e53cbba3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
10 deletions
+19
-10
display_server_x11.h
platform/linuxbsd/display_server_x11.h
+0
-1
display_server_windows.cpp
platform/windows/display_server_windows.cpp
+11
-2
display_server_windows.h
platform/windows/display_server_windows.h
+0
-1
display_server.cpp
servers/display_server.cpp
+1
-5
display_server.h
servers/display_server.h
+4
-0
README.md
thirdparty/README.md
+2
-0
vk_enum_string_helper.h
thirdparty/vulkan/vk_enum_string_helper.h
+1
-1
No files found.
platform/linuxbsd/display_server_x11.h
View file @
516b3bb8
...
...
@@ -193,7 +193,6 @@ class DisplayServerX11 : public DisplayServer {
void
_handle_key_event
(
WindowID
p_window
,
XKeyEvent
*
p_event
,
bool
p_echo
=
false
);
bool
force_quit
;
bool
minimized
;
bool
window_has_focus
;
bool
do_mouse_warp
;
...
...
platform/windows/display_server_windows.cpp
View file @
516b3bb8
...
...
@@ -1019,7 +1019,8 @@ bool DisplayServerWindows::window_is_maximize_allowed(WindowID p_window) const {
_THREAD_SAFE_METHOD_
ERR_FAIL_COND_V
(
!
windows
.
has
(
p_window
),
false
);
const
WindowData
&
wd
=
windows
[
p_window
];
// FIXME: Implement this, or confirm that it should always be true.
return
true
;
//no idea
}
...
...
@@ -1049,14 +1050,17 @@ void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, W
}
break
;
case
WINDOW_FLAG_TRANSPARENT
:
{
// FIXME: Implement.
}
break
;
case
WINDOW_FLAG_NO_FOCUS
:
{
wd
.
no_focus
=
p_enabled
;
_update_window_style
(
p_window
);
}
break
;
case
WINDOW_FLAG_MAX
:
break
;
}
}
bool
DisplayServerWindows
::
window_get_flag
(
WindowFlags
p_flag
,
WindowID
p_window
)
const
{
_THREAD_SAFE_METHOD_
...
...
@@ -1078,7 +1082,13 @@ bool DisplayServerWindows::window_get_flag(WindowFlags p_flag, WindowID p_window
}
break
;
case
WINDOW_FLAG_TRANSPARENT
:
{
// FIXME: Implement.
}
break
;
case
WINDOW_FLAG_NO_FOCUS
:
{
return
wd
.
no_focus
;
}
break
;
case
WINDOW_FLAG_MAX
:
break
;
}
return
false
;
...
...
@@ -1882,7 +1892,6 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
_send_window_event
(
windows
[
window_id
],
WINDOW_EVENT_CLOSE_REQUEST
);
//force_quit=true;
return
0
;
// Jump Back
}
case
WM_MOUSELEAVE
:
{
...
...
platform/windows/display_server_windows.h
View file @
516b3bb8
...
...
@@ -266,7 +266,6 @@ class DisplayServerWindows : public DisplayServer {
bool
shift_mem
=
false
;
bool
control_mem
=
false
;
bool
meta_mem
=
false
;
bool
force_quit
=
false
;
uint32_t
last_button_state
=
0
;
bool
use_raw_input
=
false
;
bool
drop_events
=
false
;
...
...
servers/display_server.cpp
View file @
516b3bb8
...
...
@@ -29,6 +29,7 @@
/*************************************************************************/
#include "display_server.h"
#include "core/input/input_filter.h"
#include "scene/resources/texture.h"
...
...
@@ -517,11 +518,6 @@ void DisplayServer::_bind_methods() {
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_TRANSPARENT
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_NO_FOCUS
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_MAX
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_RESIZE_DISABLED_BIT
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_BORDERLESS_BIT
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_ALWAYS_ON_TOP_BIT
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_TRANSPARENT_BIT
);
BIND_ENUM_CONSTANT
(
WINDOW_FLAG_NO_FOCUS_BIT
);
BIND_ENUM_CONSTANT
(
LATIN_KEYBOARD_QWERTY
);
BIND_ENUM_CONSTANT
(
LATIN_KEYBOARD_QWERTZ
);
...
...
servers/display_server.h
View file @
516b3bb8
...
...
@@ -200,6 +200,10 @@ public:
WINDOW_FLAG_TRANSPARENT
,
WINDOW_FLAG_NO_FOCUS
,
WINDOW_FLAG_MAX
,
};
// Separate enum otherwise we get warnings in switches not handling all values.
enum
WindowFlagsBit
{
WINDOW_FLAG_RESIZE_DISABLED_BIT
=
(
1
<<
WINDOW_FLAG_RESIZE_DISABLED
),
WINDOW_FLAG_BORDERLESS_BIT
=
(
1
<<
WINDOW_FLAG_BORDERLESS
),
WINDOW_FLAG_ALWAYS_ON_TOP_BIT
=
(
1
<<
WINDOW_FLAG_ALWAYS_ON_TOP
),
...
...
thirdparty/README.md
View file @
516b3bb8
...
...
@@ -574,6 +574,8 @@ Files extracted from upstream source:
`vk_enum_string_helper.h`
is taken from the matching
`Vulkan-ValidationLayers`
SDK release: https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/layers/generated/vk_enum_string_helper.h
Includes custom change to disable MSVC pragma, might be upstreamed via:
https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/1666
`vk_mem_alloc.h`
is taken from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
Version: 2.3.0
...
...
thirdparty/vulkan/vk_enum_string_helper.h
View file @
516b3bb8
...
...
@@ -31,7 +31,7 @@
#pragma once
#ifdef _
WIN32
#ifdef _
MSC_VER
#pragma warning( disable : 4065 )
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment