Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes remaining wide runes render issues.

Browse Source
This commit is contained in:
BDisp
2022-05-11 00:24:57 +01:00
parent 736d10598b
commit 4382a2c2c2
7 changed files with 363 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs
View File

@@ -70,7 +70,9 @@ namespace Terminal.Gui {
contents [crow, ccol - 1, 0] = (int)(uint)' ';
Curses.move (crow, ccol);
Curses.attrset (curAtttib);
} else if (runeWidth < 2 && ccol < Cols - 1 && Rune.ColumnWidth ((char)contents [crow, ccol, 0]) > 1) {
} else if (runeWidth < 2 && ccol <= Clip.Right - 1
&& Rune.ColumnWidth ((char)contents [crow, ccol, 0]) > 1) {
var curAtttib = currentAttribute;
Curses.attrset (contents [crow, ccol + 1, 1]);
@@ -78,9 +80,15 @@ namespace Terminal.Gui {
contents [crow, ccol + 1, 0] = (int)(uint)' ';
Curses.move (crow, ccol);
Curses.attrset (curAtttib);
}
if (runeWidth > 1 && ccol == Clip.Right - 1) {
Curses.addch ((int)(uint)' ');
contents [crow, ccol, 0] = (int)(uint)' ';
} else {
Curses.addch ((int)(uint)rune);
contents [crow, ccol, 0] = (int)(uint)rune;
}
Curses.addch ((int)(uint)rune);
contents [crow, ccol, 0] = (int)(uint)rune;
contents [crow, ccol, 1] = currentAttribute;
contents [crow, ccol, 2] = 1;
} else
@@ -88,7 +96,7 @@ namespace Terminal.Gui {
ccol++;
if (runeWidth > 1) {
if (validClip) {
if (validClip && ccol < Clip.Right) {
contents [crow, ccol, 1] = currentAttribute;
contents [crow, ccol, 2] = 0;
}