asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20670 from Calinou/script-editor-zoom-hidpi

Browse source 
Fix zoom display in the script editor on hiDPI displays
This commit is contained in:
Rémi Verschelde 2018-08-13 12:22:58 +02:00 committed by GitHub
commit 8cbd090249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/code_editor.cpp
View file

@ -745,7 +745,7 @@ bool CodeTextEditor::_add_font_size(int p_delta) {
if (font.is_valid()) { if (font.is_valid()) {
int new_size = CLAMP(font->get_size() + p_delta, 8 * EDSCALE, 96 * EDSCALE); int new_size = CLAMP(font->get_size() + p_delta, 8 * EDSCALE, 96 * EDSCALE);
zoom_nb->set_text(itos(100 * new_size / 14) + "%"); zoom_nb->set_text(itos(100 * new_size / (14 * EDSCALE)) + "%");
if (new_size != font->get_size()) { if (new_size != font->get_size()) {
EditorSettings::get_singleton()->set("interface/editor/code_font_size", new_size / EDSCALE); EditorSettings::get_singleton()->set("interface/editor/code_font_size", new_size / EDSCALE);
@ -1341,7 +1341,7 @@ CodeTextEditor::CodeTextEditor() {
font_resize_val = 0; font_resize_val = 0;
font_size = EditorSettings::get_singleton()->get("interface/editor/code_font_size"); font_size = EditorSettings::get_singleton()->get("interface/editor/code_font_size");
zoom_nb->set_text(itos(100 * font_size / 14) + "%"); zoom_nb->set_text(itos(100 * font_size / (14 * EDSCALE)) + "%");
font_resize_timer = memnew(Timer); font_resize_timer = memnew(Timer);
add_child(font_resize_timer); add_child(font_resize_timer);
font_resize_timer->set_one_shot(true); font_resize_timer->set_one_shot(true);