summaryrefslogtreecommitdiffstats
path: root/tools/editor/editor_file_dialog.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduz@Juans-MBP.fibertel.com.ar>2016-05-30 00:28:29 -0300
committerJuan Linietsky <reduz@Juans-MBP.fibertel.com.ar>2016-05-30 00:28:29 -0300
commit9b1f8230ec435d9289b53afa8da02367daf8b5af (patch)
treecaa9383d77d9865cfa8e41c0ca0e74318d2d9365 /tools/editor/editor_file_dialog.cpp
parentc7d24b7814b335fb9503f6a957ac5923a47da161 (diff)
downloadredot-engine-9b1f8230ec435d9289b53afa8da02367daf8b5af.tar.gz
-Some fixes to OSX retina scaling for window functions
-Implemented HiDPI detection and support for Godot Editor!
Diffstat (limited to 'tools/editor/editor_file_dialog.cpp')
-rw-r--r--tools/editor/editor_file_dialog.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index b9d4949018..185ec17459 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -7,7 +7,7 @@
#include "editor_settings.h"
#include "scene/gui/margin_container.h"
#include "os/file_access.h"
-
+#include "editor_scale.h"
EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func=NULL;
EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func=NULL;
@@ -347,7 +347,7 @@ void EditorFileDialog::_action_pressed() {
if (!valid) {
- exterr->popup_centered_minsize(Size2(250,80));
+ exterr->popup_centered_minsize(Size2(250,80)*EDSCALE);
return;
}
@@ -431,6 +431,7 @@ void EditorFileDialog::update_file_list() {
int thumbnail_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
+ thumbnail_size*=EDSCALE;
Ref<Texture> folder_thumbnail;
Ref<Texture> file_thumbnail;
@@ -840,7 +841,7 @@ void EditorFileDialog::_make_dir_confirm() {
_push_history();
} else {
- mkdirerr->popup_centered_minsize(Size2(250,50));
+ mkdirerr->popup_centered_minsize(Size2(250,50)*EDSCALE);
}
makedirname->set_text(""); // reset label
}
@@ -848,7 +849,7 @@ void EditorFileDialog::_make_dir_confirm() {
void EditorFileDialog::_make_dir() {
- makedialog->popup_centered_minsize(Size2(250,80));
+ makedialog->popup_centered_minsize(Size2(250,80)*EDSCALE);
makedirname->grab_focus();
}