Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2024-11-22 09:40:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reformat code causing clang-format clashes

Browse source 
VSCode and the clang-format git hook disagreed about how this one should
be formatted, so it kept changing.
This commit is contained in:
Leroy Hopson 2021-07-08 20:39:32 +07:00 committed by Leroy Hopson
parent 0e6334db96
commit f48e082b54
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
addons/godot_xterm/native/src/terminal.cpp
View file

@ -554,10 +554,14 @@ void Terminal::update_size() {
// Recalculates the cell_size and number of cols/rows based on font size and // Recalculates the cell_size and number of cols/rows based on font size and
// the Control's rect_size. // the Control's rect_size.
Ref<Font> fontref = fontmap.count("Regular") ? fontmap["Regular"] Ref<Font> fontref;
: has_font("Regular", "Terminal") if (fontmap.count("Regular"))
? get_font("Regular", "Terminal") fontref = fontmap["Regular"];
: get_font(""); else if (has_font("Regular", "Terminal"))
fontref = get_font("Regular", "Terminal");
else
fontref = get_font("");
cell_size = fontref->get_string_size("W"); cell_size = fontref->get_string_size("W");
rows = std::max(2, (int)floor(get_rect().size.y / cell_size.y)); rows = std::max(2, (int)floor(get_rect().size.y / cell_size.y));