mirror of
https://github.com/J-D-K/JKSV.git
synced 2026-09-14 13:35:31 -05:00
Update libs.
This commit is contained in:
Submodule Libraries/FsLib updated: 4fb3633139...995054e0d2
Submodule Libraries/SDLLib updated: 779fc5bd8a...726c56c1a2
@@ -14,6 +14,7 @@
|
||||
#include "mathutil.hpp"
|
||||
#include "strings/strings.hpp"
|
||||
#include "stringutil.hpp"
|
||||
#include "sys/OpTimer.hpp"
|
||||
#include "tasks/fileoptions.hpp"
|
||||
|
||||
#include <ctime>
|
||||
@@ -360,6 +361,7 @@ void FileOptionState::get_show_directory_properties(const fslib::Path &path)
|
||||
int64_t subDirCount{};
|
||||
int64_t fileCount{};
|
||||
int64_t totalSize{};
|
||||
|
||||
const bool getInfo = fs::get_directory_information(path, subDirCount, fileCount, totalSize);
|
||||
if (!getInfo) { return; }
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ void SettingsState::change_working_directory()
|
||||
}
|
||||
|
||||
const std::string newPathString = newPath.string();
|
||||
const std::string popMessage = stringutil::get_formatted_string(popSuccessFormat, newPathString);
|
||||
const std::string popMessage = stringutil::get_formatted_string(popSuccessFormat, newPathString.c_str());
|
||||
ui::PopMessageManager::push_message(popTicks, popMessage);
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,11 @@ void TitleSelectState::update()
|
||||
if (aPressed) { TitleSelectState::create_backup_menu(); }
|
||||
else if (xPressed) { TitleSelectState::create_title_option_menu(); }
|
||||
else if (yPressed) { TitleSelectState::add_remove_favorite(); }
|
||||
else if (bPressed) { TitleSelectState::deactivate_state(); }
|
||||
else if (bPressed)
|
||||
{
|
||||
TitleSelectState::deactivate_state();
|
||||
return;
|
||||
}
|
||||
|
||||
m_titleView->update(hasFocus);
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ void fs::copy_zip_to_directory(fs::MiniUnzip &unzip, const fslib::Path &dest, in
|
||||
|
||||
if (task)
|
||||
{
|
||||
const std::string status = stringutil::get_formatted_string(statusTemplate, unzip.get_filename());
|
||||
const std::string status = stringutil::get_formatted_string(statusTemplate, fullDest.get_filename());
|
||||
task->set_status(status);
|
||||
task->reset(static_cast<double>(fileSize));
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ ui::TitleView::TitleView(data::User *user)
|
||||
|
||||
void ui::TitleView::update(bool hasFocus)
|
||||
{
|
||||
if (m_titleTiles.empty()) { return; }
|
||||
if (m_titleTiles.empty() || !hasFocus) { return; }
|
||||
|
||||
m_bounding->update(hasFocus);
|
||||
TitleView::handle_input();
|
||||
|
||||
Reference in New Issue
Block a user