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

Merge pull request #11422 from poke1024/fixsourcefontsize2

Browse source 
Better script code font size rescaling on retina displays
This commit is contained in:
Rémi Verschelde 2017-09-20 09:32:49 +02:00 • committed by GitHub
commit ecd226c6a7
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editor/code_editor.cpp
View file

@ -993,14 +993,14 @@ void CodeTextEditor::_text_editor_gui_input(const Ref<InputEvent> &p_event) {
} }
void CodeTextEditor::_zoom_in() { void CodeTextEditor::_zoom_in() {
font_resize_val += 1; font_resize_val += EDSCALE;
if (font_resize_timer->get_time_left() == 0) if (font_resize_timer->get_time_left() == 0)
font_resize_timer->start(); font_resize_timer->start();
} }
void CodeTextEditor::_zoom_out() { void CodeTextEditor::_zoom_out() {
font_resize_val -= 1; font_resize_val -= EDSCALE;
if (font_resize_timer->get_time_left() == 0) if (font_resize_timer->get_time_left() == 0)
font_resize_timer->start(); font_resize_timer->start();
@ -1064,11 +1064,10 @@ void CodeTextEditor::_font_resize_timeout() {
Ref<DynamicFont> font = text_editor->get_font("font"); Ref<DynamicFont> font = text_editor->get_font("font");
if (font.is_valid()) { if (font.is_valid()) {
int size = font->get_size() + font_resize_val; int new_size = CLAMP(font->get_size() + font_resize_val, 8 * EDSCALE, 96 * EDSCALE);
if (new_size != font->get_size()) {
if (size >= 8 && size <= 96) { EditorSettings::get_singleton()->set("interface/source_font_size", new_size / EDSCALE);
EditorSettings::get_singleton()->set("interface/source_font_size", size); font->set_size(new_size);
font->set_size(size);
} }
font_resize_val = 0; font_resize_val = 0;