Move DisplayServer enums and typedefs to DisplayServerEnums
This will allow decoupling `display_server.h` from a number of headers in the codebase which only require those enums and not all the DisplayServer API.
This commit is contained in:
@@ -278,7 +278,7 @@ TEST_CASE("[SceneTree][SplitContainer] Collapsed") {
|
||||
|
||||
// Cursor is default.
|
||||
SEND_GUI_MOUSE_MOTION_EVENT(Point2(1, 1), MouseButtonMask::NONE, Key::NONE);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
|
||||
|
||||
// Dragger is disabled, cannot drag.
|
||||
SEND_GUI_MOUSE_BUTTON_EVENT(Point2(1, 1), MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
|
||||
@@ -377,20 +377,20 @@ TEST_CASE("[SceneTree][SplitContainer] Cursor shape") {
|
||||
|
||||
// Default cursor shape.
|
||||
SEND_GUI_MOUSE_MOTION_EVENT(not_on_dragger, MouseButtonMask::NONE, Key::NONE);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
|
||||
|
||||
// Horizontal cursor shape.
|
||||
SEND_GUI_MOUSE_MOTION_EVENT(on_dragger, MouseButtonMask::NONE, Key::NONE);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_HSPLIT);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_HSPLIT);
|
||||
|
||||
// Vertical cursor shape.
|
||||
split_container->set_vertical(true);
|
||||
SEND_GUI_MOUSE_MOTION_EVENT(on_dragger, MouseButtonMask::NONE, Key::NONE);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_VSPLIT);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_VSPLIT);
|
||||
|
||||
// Move off, default cursor shape.
|
||||
SEND_GUI_MOUSE_MOTION_EVENT(not_on_dragger, MouseButtonMask::NONE, Key::NONE);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServer::CURSOR_ARROW);
|
||||
CHECK(DS->get_cursor_shape() == DisplayServerEnums::CURSOR_ARROW);
|
||||
|
||||
memdelete(child_a);
|
||||
memdelete(child_b);
|
||||
|
||||
Reference in New Issue
Block a user