diff options
author | elfmz <fenix1905@tut.by> | 2022-11-05 20:31:53 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-05 20:31:53 +0300 |
commit | 253a6b140797e035eb9301a1632fed2408a837e2 (patch) | |
tree | ed6be316904b5d5ff11b7bfa46e7037fc2ec51d5 /far2l/src/keybar.cpp | |
parent | 89eaed71c674aadda536408638e3416bc7f4c053 (diff) |
support full-width/composite characters and true color palette in terminal (#1386)
Added normal support for full-width (CJK etc) and composite (using diacritics) characters.
IMPORTANT: WINPORT API changed in binary incompatible way in order to implement this.
Diffstat (limited to 'far2l/src/keybar.cpp')
-rw-r--r-- | far2l/src/keybar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/far2l/src/keybar.cpp b/far2l/src/keybar.cpp index 9a0c60b6..d4fbdc6d 100644 --- a/far2l/src/keybar.cpp +++ b/far2l/src/keybar.cpp @@ -180,9 +180,9 @@ void KeyBar::RefreshObject(bool Render) if (Render && WhereX()+LabelWidth<X2) { SetColor(COL_KEYBARNUM); - FS<<i+1; + FS << i + 1; SetColor(COL_KEYBARTEXT); - FS<<fmt::LeftAlign()<<fmt::Width(LabelWidth)<<fmt::Precision(LabelWidth)<<Label; + FS << fmt::Cells() << fmt::LeftAlign() << fmt::Size(LabelWidth) << Label; if (i<KEY_COUNT-1) { @@ -199,7 +199,7 @@ void KeyBar::RefreshObject(bool Render) if (Width>0) { SetColor(COL_KEYBARTEXT); - FS<<fmt::Width(Width)<<L""; + FS << fmt::Cells() << fmt::Expand(Width) << L""; } } |