Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases 1 Wiki Activity

os backend refactor
Some checks are pending
ContinuousDelivery / linux-ubuntu (push) Waiting to run
Details
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Waiting to run
Details
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Waiting to run
Details
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Waiting to run
Details
ContinuousDelivery / windows (push) Waiting to run
Details
ContinuousDelivery / windows-asan (push) Waiting to run
Details
ContinuousDelivery / release (push) Blocked by required conditions
Details
ContinuousIntegration / linux (push) Waiting to run
Details
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android]) (push) Waiting to run
Details
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android]) (push) Waiting to run
Details
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android]) (push) Waiting to run
Details
ContinuousIntegration / macos (push) Waiting to run
Details
ContinuousIntegration / windows (push) Waiting to run
Details

Browse Source
This commit is contained in:
Green Sky 2025-01-18 13:14:15 +01:00
parent 46a2c981e7
commit 88b82b0cef
No known key found for this signature in database
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/solanaceae_object_store vendored

@ -1 +1 @@
Subproject commit 18d2888e3452074245375f329d90520ac250b595 Subproject commit e5b3546292c906da4680f838c235e3464476917b

2
external/solanaceae_tox vendored

@ -1 +1 @@
Subproject commit 09300c1702f9bfb4cc857b904da33d51a94e0fe3 Subproject commit d91ad4bfa922e729b690e68858a5f48468f3b8fa

2
src/chat_gui4.cpp
View File

@ -1318,7 +1318,7 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
// deploy dummy of framedim size and check visibility // deploy dummy of framedim size and check visibility
// +2 for border // +2 for border
ImGui::Dummy(ImVec2{width+2, height+2}); ImGui::Dummy(ImVec2{width+2, height+2});
if (ImGui::IsItemVisible() && o.all_of<ObjComp::F::TagLocalHaveAll, ObjComp::F::SingleInfo, ObjComp::Ephemeral::Backend>()) { if (ImGui::IsItemVisible() && o.all_of<ObjComp::F::TagLocalHaveAll, ObjComp::F::SingleInfo, ObjComp::Ephemeral::BackendFile2>()) {
ImGui::SetCursorPos(orig_curser_pos); // reset for actual img ImGui::SetCursorPos(orig_curser_pos); // reset for actual img
auto [id, img_width, img_height] = _msg_tc.get(Message3Handle{reg, e}); auto [id, img_width, img_height] = _msg_tc.get(Message3Handle{reg, e});

8
src/media_meta_info_loader.cpp
View File

@ -45,8 +45,8 @@ void MediaMetaInfoLoader::handleMessage(const Message3Handle& m) {
return; // we dont have all data return; // we dont have all data
} }
if (!o.all_of<ObjComp::Ephemeral::Backend, ObjComp::F::SingleInfo>()) { if (!o.all_of<ObjComp::Ephemeral::BackendFile2, ObjComp::F::SingleInfo>()) {
std::cerr << "MMIL error: object missing backend/file info (?)\n"; std::cerr << "MMIL error: object missing file backend/file info (?)\n";
return; return;
} }
@ -68,14 +68,14 @@ void MediaMetaInfoLoader::handleMessage(const Message3Handle& m) {
return; return;
} }
auto* file_backend = o.get<ObjComp::Ephemeral::Backend>().ptr; auto* file_backend = o.get<ObjComp::Ephemeral::BackendFile2>().ptr;
if (file_backend == nullptr) { if (file_backend == nullptr) {
std::cerr << "MMIL error: object backend nullptr\n"; std::cerr << "MMIL error: object backend nullptr\n";
return; return;
} }
auto file2 = file_backend->file2(o, StorageBackendI::FILE2_READ); auto file2 = file_backend->file2(o, StorageBackendIFile2::FILE2_READ);
if (!file2 || !file2->isGood() || !file2->can_read) { if (!file2 || !file2->isGood() || !file2->can_read) {
std::cerr << "MMIL error: creating file2 from object via backendI\n"; std::cerr << "MMIL error: creating file2 from object via backendI\n";
return; return;

8
src/message_image_loader.cpp
View File

@ -45,8 +45,8 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl
return {std::nullopt}; return {std::nullopt};
} }
if (!o.all_of<ObjComp::Ephemeral::Backend, ObjComp::F::SingleInfo>()) { if (!o.all_of<ObjComp::Ephemeral::BackendFile2, ObjComp::F::SingleInfo>()) {
std::cerr << "MIL error: object missing backend (?)\n"; std::cerr << "MIL error: object missing file backend (?)\n";
return {std::nullopt}; return {std::nullopt};
} }
@ -68,13 +68,13 @@ TextureLoaderResult MessageImageLoader::load(TextureUploaderI& tu, Message3Handl
return {std::nullopt}; return {std::nullopt};
} }
auto* file_backend = o.get<ObjComp::Ephemeral::Backend>().ptr; auto* file_backend = o.get<ObjComp::Ephemeral::BackendFile2>().ptr;
if (file_backend == nullptr) { if (file_backend == nullptr) {
std::cerr << "MIL error: object backend nullptr\n"; std::cerr << "MIL error: object backend nullptr\n";
return {std::nullopt}; return {std::nullopt};
} }
auto file2 = file_backend->file2(o, StorageBackendI::FILE2_READ); auto file2 = file_backend->file2(o, StorageBackendIFile2::FILE2_READ);
if (!file2 || !file2->isGood() || !file2->can_read) { if (!file2 || !file2->isGood() || !file2->can_read) {
std::cerr << "MIL error: creating file2 from object via backendI\n"; std::cerr << "MIL error: creating file2 from object via backendI\n";
return {std::nullopt}; return {std::nullopt};