use better contact in forward list

external/sdl/CMakeLists.txt

@@ -9,7 +9,8 @@ if (NOT TARGET SDL3::SDL3)
 
 	FetchContent_Declare(SDL3
 		GIT_REPOSITORY https://github.com/libsdl-org/SDL
-		GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking
+		#GIT_TAG 0429f5d6a36fc35b551bcc2acd4a40c2db6dab82 # tip when looking
+		GIT_TAG 14f584a94bfd49cf1524db75bf3c419fdf9436cd # tip 26-04-2024
 		FIND_PACKAGE_ARGS # for the future
 	)
 	FetchContent_MakeAvailable(SDL3)

external/toxcore/CMakeLists.txt

@@ -12,7 +12,11 @@ add_subdirectory(./c-toxcore)
 # the sad case
 add_library(toxcore INTERFACE)
 
-target_link_libraries(toxcore INTERFACE toxcore_static)
+if (TARGET toxcore_static)
+	target_link_libraries(toxcore INTERFACE toxcore_static)
+else()
+	target_link_libraries(toxcore INTERFACE toxcore_shared)
+endif()
 
 # HACK: "install" api headers into binary dir
 configure_file(

flake.lock

@@ -63,17 +63,17 @@
     "sdl3": {
       "flake": false,
       "locked": {
-        "lastModified": 1713196978,
-        "narHash": "sha256-qn6YChphDi2p1GRwAEno6QI1rDNEmly+tElzDJnOcvg=",
+        "lastModified": 1714100414,
+        "narHash": "sha256-eaiVG5WJoLnFvdpYBR+DF+YuMu5C3lA1SKuzN8+hfDM=",
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "0429f5d6a36fc35b551bcc2acd4a40c2db6dab82",
+        "rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd",
         "type": "github"
       },
       "original": {
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "0429f5d6a36fc35b551bcc2acd4a40c2db6dab82",
+        "rev": "14f584a94bfd49cf1524db75bf3c419fdf9436cd",
         "type": "github"
       }
     },

flake.nix

@@ -11,7 +11,7 @@
       flake = false;
     };
     sdl3 = {
-      url = "github:libsdl-org/SDL/0429f5d6a36fc35b551bcc2acd4a40c2db6dab82"; # keep in sync this cmake
+      url = "github:libsdl-org/SDL/14f584a94bfd49cf1524db75bf3c419fdf9436cd"; # keep in sync this cmake
       flake = false;
     };
     sdl3_image = {

src/chat_gui/contact_list.cpp

@@ -293,7 +293,7 @@ bool renderContactBig(
 					ImGui::TextUnformatted(slt->text.c_str(), slt->text.c_str() + slt->first_line_length);
 					ImGui::PopStyleColor();
 				} else {
-					ImGui::TextDisabled(""); // or dummy?
+					ImGui::TextDisabled(" "); // or dummy?
 				}
 			}
 

src/chat_gui4.cpp

@@ -871,10 +871,15 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
 		}
 
 		if (ImGui::BeginPopup("forward to contact")) {
-			// TODO: make exclusion work
-			//for (const auto& c : _cr.view<entt::get_t<Contact::Components::TagBig>, entt::exclude_t<Contact::Components::RequestIncoming, Contact::Components::TagRequestOutgoing>>()) {
 			for (const auto& c : _cr.view<Contact::Components::TagBig>()) {
-				if (renderContactListContactSmall(c, false)) {
+				// filter
+				if (_cr.any_of<Contact::Components::RequestIncoming, Contact::Components::TagRequestOutgoing>(c)) {
+					continue;
+				}
+				// TODO: check for contact capability
+
+				if (renderContactBig(_theme, _contact_tc, {_cr, c}, 1, false, true, false)) {
+				//if (renderContactListContactSmall(c, false)) {
 					//_rmm.sendFilePath(*_selected_contact, path.filename().generic_u8string(), path.generic_u8string());
 					const auto& fil = reg.get<Message::Components::Transfer::FileInfoLocal>(e);
 					for (const auto& path : fil.file_list) {