copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Use std::filesystem::path and u8string to ensure UTF-8 is used for paths on Windows

Browse source
This commit is contained in:
Yousef Khadadeh 2025-11-21 08:35:47 +03:00
parent 5f4bc6e1cb
commit 6839e529c1
10 changed files with 59 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Toolbar.cpp
View file

@ -187,7 +187,7 @@ void Toolbar::color_selector_right(Vector4f* color) {
}
void Toolbar::load_licenses() {
std::filesystem::path third_party_license_path = "data/third_party_licenses";
std::filesystem::path third_party_license_path("data/third_party_licenses");
for(const auto& entry : std::filesystem::directory_iterator(third_party_license_path)) {
if(entry.is_regular_file())
thirdPartyLicenses.emplace_back(entry.path().filename().string(), read_file_to_string(entry.path()));
@ -1269,7 +1269,7 @@ void Toolbar::open_world_file(int conType, const std::string& netSource, const s
UploadData* uD = (UploadData*)callbackData;
uD->main->new_tab({
.conType = (World::ConnectionType)uD->cT,
.fileSource = fileName,
.filePathSource = std::filesystem::path(fileName),
.netSource = uD->nS,
.serverLocalID = uD->sLID,
.fileDataBuffer = buffer
@ -1280,7 +1280,7 @@ void Toolbar::open_world_file(int conType, const std::string& netSource, const s
open_file_selector("Open", {{"Any File", "*"}, {"InfiniPaint Canvas", World::FILE_EXTENSION}}, [&, conType = conType, netSource = netSource, serverLocalID2 = serverLocalID2](const std::filesystem::path& p, const auto& e) {
main.new_tab({
.conType = (World::ConnectionType)conType,
.fileSource = p.string(),
.filePathSource = p,
.netSource = netSource,
.serverLocalID = serverLocalID2
});
@ -1334,7 +1334,6 @@ void Toolbar::options_menu() {
else {
main.new_tab({
.conType = World::CONNECTIONTYPE_CLIENT,
.fileSource = "",
.netSource = serverToConnectTo
}, true);
optionsMenuOpen = false;