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

prep message serl for file objects
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 2024-10-27 15:09:06 +01:00
parent 92740c8dbe
commit 2d96139d4a
No known key found for this signature in database
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/solanaceae_message_serializer vendored

@ -1 +1 @@
Subproject commit e574c4f7798ab8529879fb9f58795ac3c346daf6 Subproject commit f83026beed88ef344ce5f59ea369eef152742e68

7
src/chat_gui4.cpp
View File

@ -1048,6 +1048,11 @@ void ChatGui4::renderMessageBodyText(Message3Registry& reg, const Message3 e) {
void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) { void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
auto o = reg.get<Message::Components::MessageFileObject>(e).o; auto o = reg.get<Message::Components::MessageFileObject>(e).o;
if (!o) {
ImGui::TextDisabled("file message missing file object!");
return;
}
if ( if (
!_show_chat_avatar_tf !_show_chat_avatar_tf
&& ( && (
@ -1457,7 +1462,7 @@ void ChatGui4::pasteFile(const char* mime_type) {
size_t data_size = 0; size_t data_size = 0;
void* data = SDL_GetClipboardData(mime_type, &data_size); void* data = SDL_GetClipboardData(mime_type, &data_size);
std::cout << "CG: pasted image of size " << data_size << " mime " << mime_type << "\n"; std::cout << "CG: pasted image of size: " << data_size << " mimetype: " << mime_type << "\n";
_sip.sendMemory( _sip.sendMemory(
static_cast<const uint8_t*>(data), data_size, static_cast<const uint8_t*>(data), data_size,

2
src/main_screen.cpp
View File

@ -20,7 +20,7 @@ MainScreen::MainScreen(SimpleConfigModel&& conf_, SDL_Renderer* renderer_, Theme
renderer(renderer_), renderer(renderer_),
conf(std::move(conf_)), conf(std::move(conf_)),
rmm(cr), rmm(cr),
msnj{cr, {}, {}}, msnj{cr, os, {}, {}},
mts(rmm), mts(rmm),
sm(os), sm(os),
tc(save_path, save_password), tc(save_path, save_password),