wip contact tree

.github/workflows/cd.yml

@@ -64,8 +64,6 @@ jobs:
     strategy:
       matrix:
         platform:
-          - vcpkg_toolkit: arm-neon-android
-            ndk_abi: armeabi-v7a
           - vcpkg_toolkit: arm64-android
             ndk_abi: arm64-v8a
           - vcpkg_toolkit: x64-android

.github/workflows/ci.yml

@@ -38,8 +38,6 @@ jobs:
     strategy:
       matrix:
         platform:
-          - vcpkg_toolkit: arm-neon-android
-            ndk_abi: armeabi-v7a
           - vcpkg_toolkit: arm64-android
             ndk_abi: arm64-v8a
           - vcpkg_toolkit: x64-android

external/sdl/CMakeLists.txt

@@ -25,8 +25,7 @@ if (NOT TARGET SDL3::SDL3)
 		#GIT_TAG 6e885d96193a4b0096fe7fed6d4e6c3e5f247283 # tip 09-09-2024
 		#GIT_TAG 9dd8859240703d886941733ad32c1dc6f50d64f0 # tip 19-09-2024
 		#GIT_TAG afdf325fb4090e93a124519d1a3bc1fbe0ba9025 # bad
-		#GIT_TAG e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e # tip 05-10-2024 (3.1.3)
-		GIT_TAG 2654d5d48b8f764148a7c246fea85b32b1133578 # tip 18-10-2024
+		GIT_TAG e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e # tip 05-10-2024 (3.1.3)
 
 		FIND_PACKAGE_ARGS # for the future
 	)

external/solanaceae_util

@@ -1 +1 @@
-Subproject commit 9a4df12d68373cd19adddde2364843eeac51c28d
+Subproject commit 17d2baf7365c3499172dc5afd71171cb3a138d99

flake.lock

@@ -63,17 +63,17 @@
     "sdl3": {
       "flake": false,
       "locked": {
-        "lastModified": 1729218869,
-        "narHash": "sha256-0KrwC3Yrs1LHwT9SPvknDwPymNmksq6dixM4/KiFqFA=",
+        "lastModified": 1728073678,
+        "narHash": "sha256-S7yRcLHMPgq6+gec8l+ESxp2dJ+6Po/UNsBUXptQzMQ=",
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "2654d5d48b8f764148a7c246fea85b32b1133578",
+        "rev": "e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e",
         "type": "github"
       },
       "original": {
         "owner": "libsdl-org",
         "repo": "SDL",
-        "rev": "2654d5d48b8f764148a7c246fea85b32b1133578",
+        "rev": "e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e",
         "type": "github"
       }
     },

flake.nix

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

src/CMakeLists.txt

@@ -80,6 +80,8 @@ target_sources(tomato PUBLIC
 	./chat_gui/icons/group.cpp
 	./chat_gui/contact_list.hpp
 	./chat_gui/contact_list.cpp
+	./chat_gui/contact_tree.hpp
+	./chat_gui/contact_tree.cpp
 	./chat_gui/file_selector.hpp
 	./chat_gui/file_selector.cpp
 	./chat_gui/send_image_popup.hpp

src/chat_gui/contact_tree.cpp

@@ -0,0 +1,97 @@
+#include "./contact_tree.hpp"
+
+#include <solanaceae/contact/components.hpp>
+
+#include "./contact_list.hpp"
+#include "entt/entity/entity.hpp"
+
+#include <imgui/imgui.h>
+
+namespace Components {
+	struct TagTreeViewOpen {};
+};
+
+ContactTreeWindow::ContactTreeWindow(Contact3Registry& cr, Theme& theme, ContactTextureCache& ctc) : _cr(cr), _theme(theme), _ctc(ctc) {
+}
+
+void ContactTreeWindow::render(void) {
+	//{ // main window menubar injection
+	//    // assumes the window "tomato" was rendered already by cg
+	//    if (ImGui::Begin("tomato")) {
+	//        if (ImGui::BeginMenuBar()) {
+	//            ImGui::Separator();
+	//            if (ImGui::BeginMenu("Settings")) {
+	//                if (ImGui::MenuItem("settings window", nullptr, _show_window)) {
+	//                    _show_window = !_show_window;
+	//                }
+	//                ImGui::EndMenu();
+	//            }
+	//            ImGui::EndMenuBar();
+	//        }
+	//    }
+	//    ImGui::End();
+	//}
+
+	if (_show_window) {
+		if (ImGui::Begin("ContactTreeWindow", &_show_window)) {
+
+			if (ImGui::BeginTable("##table", 1, ImGuiTableFlags_None)) {
+				// first we need all root nodes
+				for (const auto [cv_root] : _cr.view<Contact::Components::TagRoot>().each()) {
+					ImGui::TableNextRow();
+					ImGui::PushID(entt::to_integral(cv_root));
+
+					ImGui::TableNextColumn();
+
+					Contact3Handle c_root {_cr, cv_root};
+					bool open = c_root.all_of<Components::TagTreeViewOpen>();
+
+					bool has_children = c_root.all_of<Contact::Components::ParentOf>();
+
+					// roots are usually no normal contacts
+					// they should display as a protocol or profile or account
+					// TODO: set some table background instead of full span selected?
+					if (renderContactBig(_theme, _ctc, c_root, 2, false, true)) {
+						// clicked, toggle open
+						if (open) {
+							c_root.remove<Components::TagTreeViewOpen>();
+							open = false;
+						} else {
+							c_root.emplace_or_replace<Components::TagTreeViewOpen>();
+							open = true;
+						}
+					}
+
+					if (open) {
+						// render children
+
+						ImGui::Indent();
+
+						if (c_root.all_of<Contact::Components::ParentOf>()) {
+							for (const auto cv_child : c_root.get<Contact::Components::ParentOf>().subs) {
+								ImGui::PushID(entt::to_integral(cv_child));
+
+								Contact3Handle c_child {_cr, cv_child};
+								renderContactBig(_theme, _ctc, c_child, 2);
+
+								ImGui::PopID();
+							}
+						} else {
+							// TODO: remove
+							ImGui::TableNextRow();
+							ImGui::TableNextColumn();
+							ImGui::TextDisabled("no parent of");
+						}
+
+						ImGui::Unindent();
+
+					}
+					ImGui::PopID();
+				}
+				ImGui::EndTable();
+			}
+		}
+		ImGui::End();
+	}
+}
+

src/chat_gui/contact_tree.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <solanaceae/contact/contact_model3.hpp>
+
+#include "./texture_cache_defs.hpp"
+
+// fwd
+struct Theme;
+
+class ContactTreeWindow {
+	bool _show_window {true};
+
+	Contact3Registry& _cr;
+
+	Theme& _theme;
+	ContactTextureCache& _ctc;
+
+	public:
+		ContactTreeWindow(Contact3Registry& cr, Theme& theme, ContactTextureCache& ctc);
+
+		void render(void);
+};
+

src/main_screen.cpp

@@ -43,6 +43,7 @@ MainScreen::MainScreen(SimpleConfigModel&& conf_, SDL_Renderer* renderer_, Theme
 	mil(),
 	msg_tc(mil, sdlrtu),
 	cg(conf, os, rmm, cr, sdlrtu, contact_tc, msg_tc, theme),
+	ctw(cr, theme, contact_tc),
 	sw(conf),
 	osui(os),
 	tuiu(tc, conf),
@@ -357,6 +358,7 @@ Screen* MainScreen::render(float time_delta, bool&) {
 	const float msgtc_interval = msg_tc.update();
 
 	const float cg_interval = cg.render(time_delta); // render
+	ctw.render();
 	sw.render(); // render
 	osui.render();
 	tuiu.render(); // render

src/main_screen.hpp

@@ -30,6 +30,7 @@
 #include "./message_image_loader.hpp"
 
 #include "./chat_gui4.hpp"
+#include "./chat_gui/contact_tree.hpp"
 #include "./chat_gui/settings_window.hpp"
 #include "./object_store_ui.hpp"
 #include "./tox_ui_utils.hpp"
@@ -92,6 +93,7 @@ struct MainScreen final : public Screen {
 	TextureCache<void*, Message3Handle, MessageImageLoader> msg_tc;
 
 	ChatGui4 cg;
+	ContactTreeWindow ctw;
 	SettingsWindow sw;
 	ObjectStoreUI osui;
 	ToxUIUtils tuiu;