Merge pull request #26958 from bruvzg/macos_hidpi_fixes

Fix hiDPI scaling support in `get_real_window_size` and `set_window.size`
This commit is contained in:
Rémi Verschelde 2019-04-01 11:00:50 +02:00 committed by GitHub
commit ab76c649c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2270,12 +2270,12 @@ Size2 OS_OSX::get_window_size() const {
Size2 OS_OSX::get_real_window_size() const {
NSRect frame = [window_object frame];
return Size2(frame.size.width, frame.size.height);
return Size2(frame.size.width, frame.size.height) * _display_scale();
}
void OS_OSX::set_window_size(const Size2 p_size) {
Size2 size = p_size;
Size2 size = p_size / _display_scale();
if (get_borderless_window() == false) {
// NSRect used by setFrame includes the title bar, so add it to our size.y