shadps4-emu/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2024-11-23 03:09:55 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

savedatadialog_ui: Use fmt::localtime instead of formatting std::chrono::local_time (#1574)
Some checks are pending
Build and Release / reuse (push) Waiting to run
Details
Build and Release / clang-format (push) Waiting to run
Details
Build and Release / get-info (push) Waiting to run
Details
Build and Release / windows-sdl (push) Blocked by required conditions
Details
Build and Release / windows-qt (push) Blocked by required conditions
Details
Build and Release / macos-sdl (push) Blocked by required conditions
Details
Build and Release / macos-qt (push) Blocked by required conditions
Details
Build and Release / linux-sdl (push) Blocked by required conditions
Details
Build and Release / linux-qt (push) Blocked by required conditions
Details
Build and Release / pre-release (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
squidbus 2024-11-22 08:29:41 -08:00 committed by GitHub
parent c71385ec90
commit 15d6b095f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/libraries/save_data/dialog/savedatadialog_ui.cpp
View File

@ -13,33 +13,6 @@
#include "imgui/imgui_std.h" #include "imgui/imgui_std.h"
#include "savedatadialog_ui.h" #include "savedatadialog_ui.h"
#ifdef __APPLE__
#include <date/tz.h>
// Need to make a copy of the formatter for std::chrono::local_time for use with date::local_time
template <typename Duration, typename Char>
struct fmt::formatter<date::local_time<Duration>, Char> : formatter<std::tm, Char> {
FMT_CONSTEXPR formatter() {
this->format_str_ = fmt::detail::string_literal<Char, '%', 'F', ' ', '%', 'T'>();
}
template <typename FormatContext>
auto format(date::local_time<Duration> val, FormatContext& ctx) const -> decltype(ctx.out()) {
using period = typename Duration::period;
if (period::num == 1 && period::den == 1 &&
!std::is_floating_point<typename Duration::rep>::value) {
return formatter<std::tm, Char>::format(
localtime(fmt::detail::to_time_t(date::current_zone()->to_sys(val))), ctx);
}
auto epoch = val.time_since_epoch();
auto subsecs = fmt::detail::duration_cast<Duration>(
epoch - fmt::detail::duration_cast<std::chrono::seconds>(epoch));
return formatter<std::tm, Char>::do_format(
localtime(fmt::detail::to_time_t(date::current_zone()->to_sys(val))), ctx, &subsecs);
}
};
#endif
using namespace ImGui; using namespace ImGui;
using namespace Libraries::CommonDialog; using namespace Libraries::CommonDialog;
using Common::ElfInfo; using Common::ElfInfo;
@ -125,12 +98,9 @@ SaveDialogState::SaveDialogState(const OrbisSaveDataDialogParam& param) {
param_sfo.Open(param_sfo_path); param_sfo.Open(param_sfo_path);
auto last_write = param_sfo.GetLastWrite(); auto last_write = param_sfo.GetLastWrite();
#ifdef __APPLE__ std::string date_str =
auto t = date::zoned_time{date::current_zone(), last_write}; fmt::format("{:%d %b, %Y %R}",
#else fmt::localtime(std::chrono::system_clock::to_time_t(last_write)));
auto t = std::chrono::zoned_time{std::chrono::current_zone(), last_write};
#endif
std::string date_str = fmt::format("{:%d %b, %Y %R}", t.get_local_time());
size_t size = Common::FS::GetDirectorySize(dir_path); size_t size = Common::FS::GetDirectorySize(dir_path);
std::string size_str = SpaceSizeToString(size); std::string size_str = SpaceSizeToString(size);