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

Center cell string vertically

Browse source 
This prevents overlapping so we no longer need to draw all background
cells before the foreground.


Former-commit-id: faca53fe28
This commit is contained in:
Leroy Hopson 2020-09-28 16:25:21 +07:00
parent cc457b8b9a
commit 9bdf69f6f5
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -358,28 +358,17 @@ void Terminal::_draw()
if (sleep) if (sleep)
return; return;
/* Draw the background */ /* Draw the full terminal rect background */
draw_rect(get_rect(), get_color("Background", "Terminal")); draw_rect(get_rect(), get_color("Background", "Terminal"));
/* Draw the cell backgrounds */
// Draw the background first so subsequent rows don't overlap
// foreground characters such as y that may extend below the baseline.
for (int row = 0; row < rows; row++) for (int row = 0; row < rows; row++)
{ {
for (int col = 0; col < cols; col++) for (int col = 0; col < cols; col++)
{ {
draw_background(row, col, get_cell_colors(row, col).first); /* Draw cell background and foreground */
} std::pair<Color, Color> color_pair = get_cell_colors(row, col);
} draw_background(row, col, color_pair.first);
draw_foreground(row, col, color_pair.second);
/* Draw the cell foregrounds */
for (int row = 0; row < rows; row++)
{
for (int col = 0; col < cols; col++)
{
draw_foreground(row, col, get_cell_colors(row, col).second);
} }
} }
} }
@ -466,7 +455,7 @@ void Terminal::draw_foreground(int row, int col, Color fgcolor)
; // TODO: Handle blink ; // TODO: Handle blink
int font_height = fontref.ptr()->get_height(); int font_height = fontref.ptr()->get_height();
Vector2 foreground_pos = Vector2(col * cell_size.x, row * cell_size.y + font_height); Vector2 foreground_pos = Vector2(col * cell_size.x, row * cell_size.y + font_height / 1.25);
draw_string(fontref, foreground_pos, cell.ch, fgcolor); draw_string(fontref, foreground_pos, cell.ch, fgcolor);
if (cell.attr.underline) if (cell.attr.underline)