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/datetime.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/datetime.cpp')
| -rw-r--r-- | far2l/src/datetime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/far2l/src/datetime.cpp b/far2l/src/datetime.cpp index 939a69ff..93fd125d 100644 --- a/far2l/src/datetime.cpp +++ b/far2l/src/datetime.cpp @@ -788,7 +788,7 @@ void ConvertDate(const FILETIME &ft,FARString &strDateText, FARString &strTimeTe break; } FormatString Fmt; - Fmt<<fmt::FillChar(f1)<<fmt::Width(w1)<<p1<<DateSeparator<<fmt::FillChar(f2)<<fmt::Width(w2)<<p2<<DateSeparator<<fmt::FillChar(f3)<<fmt::Width(w3)<<p3; + Fmt<<fmt::FillChar(f1)<<fmt::Expand(w1)<<p1<<DateSeparator<<fmt::FillChar(f2)<<fmt::Expand(w2)<<p2<<DateSeparator<<fmt::FillChar(f3)<<fmt::Expand(w3)<<p3; strDateText=std::move(Fmt.strValue()); } } @@ -817,6 +817,6 @@ void ConvertRelativeDate(const FILETIME &ft,FARString &strDaysText,FARString &st strDaysText=std::move(DaysText.strValue()); FormatString TimeText; - TimeText<<fmt::Width(2)<<fmt::FillChar(L'0')<<h<<GetTimeSeparator()<<fmt::Width(2)<<fmt::FillChar(L'0')<<m<<GetTimeSeparator()<<fmt::Width(2)<<fmt::FillChar(L'0')<<s<<GetDecimalSeparator()<<fmt::Width(3)<<fmt::FillChar(L'0')<<ms; + TimeText<<fmt::Expand(2)<<fmt::FillChar(L'0')<<h<<GetTimeSeparator()<<fmt::Expand(2)<<fmt::FillChar(L'0')<<m<<GetTimeSeparator()<<fmt::Expand(2)<<fmt::FillChar(L'0')<<s<<GetDecimalSeparator()<<fmt::Expand(3)<<fmt::FillChar(L'0')<<ms; strTimeText=std::move(TimeText.strValue()); } |