Skip to content

Commit

Permalink
Window management improvements.
Browse files Browse the repository at this point in the history 
[macOS] Fix transient windows not working in the full-screen mode.
[macOS] Fix moving transient windows to the other screen than parent window.
[macOS] Fix popup menu switch on hover.
[macOS] Use content origin rect for windows position (to ensure `DS.mouse_get_position` is equal to `DS.window_get_position` + mouse position from the input events).
[macOS] Fix incorrect input coordinates, when external display with different scaling in connected/disconnected.
[macOS/Windows] Fix moving fullscreen windows between the screens.
Add auto refocusing of the parent window, when the focused transient window is closed.
Remove redundant `DS.mouse_get_absolute_position` function (returns mouse position in the screen coordinates, same as `DS.mouse_get_position`).
  • Loading branch information
@bruvzg
bruvzg committed Jan 18, 2022
1 parent 8ae86f6 commit d62ca0c
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 55 deletions.
5 changes: 0 additions & 5 deletions doc/classes/DisplayServer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,6 @@
[b]Note:[/b] This method is implemented on Linux, macOS and Windows.
</description>
</method>
<method name="mouse_get_absolute_position" qualifiers="const">
<return type="Vector2i" />
<description>
</description>
</method>
<method name="mouse_get_button_state" qualifiers="const">
<return type="int" enum="MouseButton" />
<description>
Expand Down
15 changes: 0 additions & 15 deletions platform/linuxbsd/display_server_x11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,21 +365,6 @@ void DisplayServerX11::mouse_warp_to_position(const Point2i &p_to) {
}

Point2i DisplayServerX11::mouse_get_position() const {
int root_x, root_y;
int win_x, win_y;
unsigned int mask_return;
Window window_returned;

Bool result = XQueryPointer(x11_display, RootWindow(x11_display, DefaultScreen(x11_display)), &window_returned,
&window_returned, &root_x, &root_y, &win_x, &win_y,
&mask_return);
if (result == True) {
return Point2i(root_x, root_y);
}
return Point2i();
}

Point2i DisplayServerX11::mouse_get_absolute_position() const {
int number_of_screens = XScreenCount(x11_display);
for (int i = 0; i < number_of_screens; i++) {
Window root, child;
Expand Down
1 change: 0 additions & 1 deletion platform/linuxbsd/display_server_x11.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ class DisplayServerX11 : public DisplayServer {

virtual void mouse_warp_to_position(const Point2i &p_to) override;
virtual Point2i mouse_get_position() const override;
virtual Point2i mouse_get_absolute_position() const override;
virtual MouseButton mouse_get_button_state() const override;

virtual void clipboard_set(const String &p_text) override;
Expand Down
3 changes: 2 additions & 1 deletion platform/osx/display_server_osx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ class DisplayServerOSX : public DisplayServer {
NSTimeInterval last_warp = 0;
bool ignore_warp = false;

float display_max_scale = 1.f;

Vector<KeyEvent> key_event_buffer;
int key_event_pos;

Expand Down Expand Up @@ -214,7 +216,6 @@ class DisplayServerOSX : public DisplayServer {

virtual void mouse_warp_to_position(const Point2i &p_to) override;
virtual Point2i mouse_get_position() const override;
virtual Point2i mouse_get_absolute_position() const override;
virtual MouseButton mouse_get_button_state() const override;

virtual void clipboard_set(const String &p_text) override;
Expand Down
63 changes: 38 additions & 25 deletions platform/osx/display_server_osx.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,7 @@ - (void)windowWillClose:(NSNotification *)notification {
}

if (wd.transient_parent != DisplayServerOSX::INVALID_WINDOW_ID) {
DisplayServerOSX::WindowData &pwd = DS_OSX->windows[wd.transient_parent];
[pwd.window_object makeKeyAndOrderFront:nil]; // Move focus back to parent.
DS_OSX->window_set_transient(window_id, DisplayServerOSX::INVALID_WINDOW_ID);
} else if ((window_id != DisplayServerOSX::MAIN_WINDOW_ID) && (DS_OSX->windows.size() == 1)) {
DisplayServerOSX::WindowData &pwd = DS_OSX->windows[DisplayServerOSX::MAIN_WINDOW_ID];
[pwd.window_object makeKeyAndOrderFront:nil]; // Move focus back to main window if there is no parent or other windows left.
}

#if defined(GLES3_ENABLED)
Expand Down Expand Up @@ -2001,10 +1996,6 @@ - (BOOL)canBecomeMainWindow {
}

Point2i DisplayServerOSX::mouse_get_position() const {
return last_mouse_pos;
}

Point2i DisplayServerOSX::mouse_get_absolute_position() const {
_THREAD_SAFE_METHOD_

const NSPoint mouse_pos = [NSEvent mouseLocation];
Expand Down Expand Up @@ -2071,10 +2062,8 @@ - (BOOL)canBecomeMainWindow {
// to convert between OS X native screen coordinates and the ones expected by Godot

static bool displays_arrangement_dirty = true;
static bool displays_scale_dirty = true;
static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplayChangeSummaryFlags flags, void *user_info) {
displays_arrangement_dirty = true;
displays_scale_dirty = true;
}

Point2i DisplayServerOSX::_get_screens_origin() const {
Expand Down Expand Up @@ -2185,15 +2174,8 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
float DisplayServerOSX::screen_get_max_scale() const {
_THREAD_SAFE_METHOD_

static float scale = 1.f;
if (displays_scale_dirty) {
int screen_count = get_screen_count();
for (int i = 0; i < screen_count; i++) {
scale = fmax(scale, screen_get_scale(i));
}
displays_scale_dirty = false;
}
return scale;
// Note: Do not update max display scale on screen configuration change, existing editor windows can't be rescaled on the fly.
return display_max_scale;
}

Rect2i DisplayServerOSX::screen_get_usable_rect(int p_screen) const {
Expand Down Expand Up @@ -2380,8 +2362,24 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay

void DisplayServerOSX::window_set_current_screen(int p_screen, WindowID p_window) {
_THREAD_SAFE_METHOD_

ERR_FAIL_COND(!windows.has(p_window));
WindowData &wd = windows[p_window];

bool was_fullscreen = false;
if (wd.fullscreen) {
// Temporary exit fullscreen mode to move window.
[wd.window_object toggleFullScreen:nil];
was_fullscreen = true;
}

Point2i wpos = window_get_position(p_window) - screen_get_position(window_get_current_screen(p_window));
window_set_position(wpos + screen_get_position(p_screen), p_window);

if (was_fullscreen) {
// Re-enter fullscreen mode.
[wd.window_object toggleFullScreen:nil];
}
}

void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent) {
Expand All @@ -2404,7 +2402,7 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
wd_window.transient_parent = INVALID_WINDOW_ID;
wd_parent.transient_children.erase(p_window);

[wd_parent.window_object removeChildWindow:wd_window.window_object];
[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
} else {
ERR_FAIL_COND(!windows.has(p_parent));
ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
Expand All @@ -2413,7 +2411,7 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
wd_window.transient_parent = p_parent;
wd_parent.transient_children.insert(p_window);

[wd_parent.window_object addChildWindow:wd_window.window_object ordered:NSWindowAbove];
[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
}
}

Expand All @@ -2423,7 +2421,9 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
ERR_FAIL_COND_V(!windows.has(p_window), Point2i());
const WindowData &wd = windows[p_window];

NSRect nsrect = [wd.window_object frame];
// Use content rect position (without titlebar / window border).
const NSRect contentRect = [wd.window_view frame];
const NSRect nsrect = [wd.window_object convertRectToScreen:contentRect];
Point2i pos;

// Return the position of the top-left corner, for OS X the y starts at the bottom
Expand Down Expand Up @@ -2451,7 +2451,16 @@ static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplay
position += _get_screens_origin();
position /= screen_get_max_scale();

[wd.window_object setFrameTopLeftPoint:NSMakePoint(position.x, position.y)];
// Remove titlebar / window border size.
const NSRect contentRect = [wd.window_view frame];
const NSRect windowRect = [wd.window_object frame];
const NSRect nsrect = [wd.window_object convertRectToScreen:contentRect];
Point2i offset;
offset.x = (nsrect.origin.x - windowRect.origin.x);
offset.y = (nsrect.origin.y + nsrect.size.height);
offset.y -= (windowRect.origin.y + windowRect.size.height);

[wd.window_object setFrameTopLeftPoint:NSMakePoint(position.x - offset.x, position.y - offset.y)];

_update_window(wd);
_get_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
Expand Down Expand Up @@ -3699,7 +3708,11 @@ void _update_keyboard_layouts() {

keyboard_layout_dirty = true;
displays_arrangement_dirty = true;
displays_scale_dirty = true;

int screen_count = get_screen_count();
for (int i = 0; i < screen_count; i++) {
display_max_scale = fmax(display_max_scale, screen_get_scale(i));
}

// Register to be notified on keyboard layout changes
CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(),
Expand Down
16 changes: 14 additions & 2 deletions platform/windows/display_server_windows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,20 @@ void DisplayServerWindows::window_set_current_screen(int p_screen, WindowID p_wi
ERR_FAIL_COND(!windows.has(p_window));
ERR_FAIL_INDEX(p_screen, get_screen_count());

Vector2 ofs = window_get_position(p_window) - screen_get_position(window_get_current_screen(p_window));
window_set_position(ofs + screen_get_position(p_screen), p_window);
const WindowData &wd = windows[p_window];
if (wd.fullscreen) {
int cs = window_get_current_screen(p_window);
if (cs == p_screen) {
return;
}
Point2 pos = screen_get_position(p_screen);
Size2 size = screen_get_size(p_screen);

MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
} else {
Vector2 ofs = window_get_position(p_window) - screen_get_position(window_get_current_screen(p_window));
window_set_position(ofs + screen_get_position(p_screen), p_window);
}
}

Point2i DisplayServerWindows::window_get_position(WindowID p_window) const {
Expand Down
5 changes: 5 additions & 0 deletions scene/main/window.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,11 @@ void Window::_clear_window() {
DisplayServer::get_singleton()->delete_sub_window(window_id);
window_id = DisplayServer::INVALID_WINDOW_ID;

// If closing window was focused and has a parent, return focus.
if (focused && transient_parent) {
transient_parent->grab_focus();
}

_update_viewport_size();
RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
}
Expand Down
5 changes: 0 additions & 5 deletions servers/display_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ void DisplayServer::mouse_warp_to_position(const Point2i &p_to) {
WARN_PRINT("Mouse warping is not supported by this display server.");
}

Point2i DisplayServer::mouse_get_absolute_position() const {
ERR_FAIL_V_MSG(Point2i(), "Mouse is not supported by this display server.");
}

Point2i DisplayServer::mouse_get_position() const {
ERR_FAIL_V_MSG(Point2i(), "Mouse is not supported by this display server.");
}
Expand Down Expand Up @@ -359,7 +355,6 @@ void DisplayServer::_bind_methods() {

ClassDB::bind_method(D_METHOD("mouse_warp_to_position", "position"), &DisplayServer::mouse_warp_to_position);
ClassDB::bind_method(D_METHOD("mouse_get_position"), &DisplayServer::mouse_get_position);
ClassDB::bind_method(D_METHOD("mouse_get_absolute_position"), &DisplayServer::mouse_get_absolute_position);
ClassDB::bind_method(D_METHOD("mouse_get_button_state"), &DisplayServer::mouse_get_button_state);

ClassDB::bind_method(D_METHOD("clipboard_set", "clipboard"), &DisplayServer::clipboard_set);
Expand Down
1 change: 0 additions & 1 deletion servers/display_server.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ class DisplayServer : public Object {

virtual void mouse_warp_to_position(const Point2i &p_to);
virtual Point2i mouse_get_position() const;
virtual Point2i mouse_get_absolute_position() const;
virtual MouseButton mouse_get_button_state() const;

virtual void clipboard_set(const String &p_text);
Expand Down

0 comments on commit d62ca0c

Please sign in to comment.