Add branch info

AP-Sensing · Nov 6, 2024 · 8464e43 · 8464e43
1 parent 7cdd5ed
commit 8464e43
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/src/core/OSTreeTUI.cpp b/src/core/OSTreeTUI.cpp
@@ -141,7 +141,7 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
 	});
 
 	// interchangeable view (composed)
-	manager = std::unique_ptr<Manager>(new Manager(infoView, filterView));
+	manager = std::unique_ptr<Manager>(new Manager(*this, infoView, filterView));
   	managerRenderer = manager->managerRenderer;
 
 	// FOOTER

diff --git a/src/core/OSTreeTUI.hpp b/src/core/OSTreeTUI.hpp
@@ -20,6 +20,9 @@
 
 #include "../util/cpplibostree.hpp"
 
+class BranchBoxManager; // TODO fix includes
+class Manager;          // TODO fix includes
+
 class OSTreeTUI {
 public:
     /**
@@ -42,7 +45,7 @@ class OSTreeTUI {
 
     /// @brief Refresh Level 2: Refreshes the commit list component & upper levels
     void refresh_commitListComoponent();
-    
+
     /// @brief Refresh Level 1: Refreshes complete repository & upper levels
     bool refresh_repository();
 

diff --git a/src/core/commit.cpp b/src/core/commit.cpp
@@ -351,9 +351,6 @@ ftxui::Element commitRender(OSTreeTUI& ostreetui, const std::unordered_map<std::
 		if (usedBranches.at(relevantBranch) == -1) {
 			ostreetui.columnToBranchMap.push_back(relevantBranch);
 			usedBranches.at(relevantBranch) = nextAvailableSpace--;
-			// TODO somehow incorporate the branch name into the commit-tree
-			//addLine(RenderTree::TREE_LINE_IGNORE_BRANCH, RenderLine::BRANCH_HEAD,
-			//		treeElements, commElements, commit, highlight, usedBranches, branchColorMap);
 		}
 		// commit
 		if (scrollOffset++ >= 0) {

diff --git a/src/core/manager.cpp b/src/core/manager.cpp
@@ -12,7 +12,7 @@
 
 // Manager
 
-Manager::Manager(const ftxui::Component& infoView, const ftxui::Component& filterView) {
+Manager::Manager(OSTreeTUI& ostreetui, const ftxui::Component& infoView, const ftxui::Component& filterView) : ostreetui(ostreetui) {
 	using namespace ftxui;
 
 	tabSelection = Menu(&tab_entries, &tab_index, MenuOption::HorizontalAnimated());
@@ -25,7 +25,17 @@ Manager::Manager(const ftxui::Component& infoView, const ftxui::Component& filte
 
 	managerRenderer = Container::Vertical({
         tabSelection,
-      	tabContent
+      	tabContent,
+		Renderer([] {return vbox({filler()}) | flex;}), // push elements apart
+		Renderer([&] {
+			Elements branches;
+			for (int i{ostreetui.columnToBranchMap.size() - 1}; i >= 0; i--) {
+				std::string branch = ostreetui.columnToBranchMap.at(i);
+				std::string line = "――☐――― " + branch;
+				branches.push_back(text(line) | color(ostreetui.branchColorMap.at(branch)));
+			}
+			return vbox(branches);
+		})
   	});
 }
 

diff --git a/src/core/manager.hpp b/src/core/manager.hpp
@@ -5,17 +5,24 @@
  |   different modes should be supported (like a rebase mode
  |   exchangeable with the commit info)
  |___________________________________________________________*/
+#pragma once
 
 #include <string>
 #include <unordered_map>
 
 #include "ftxui/component/component.hpp"  // for Component
 
+#include "OSTreeTUI.hpp"
+
 #include "../util/cpplibostree.hpp"
 
+class OSTreeTUI; // TODO fix includes
+
 /// Interchangeable View
 class Manager {
 public:
+    OSTreeTUI& ostreetui;
+
     int tab_index{0};
 
     std::vector<std::string> tab_entries = {
@@ -30,7 +37,7 @@ class Manager {
     ftxui::Component managerRenderer;
 
 public:
-    Manager(const ftxui::Component& infoView, const ftxui::Component& filterView);
+    Manager(OSTreeTUI& ostreetui, const ftxui::Component& infoView, const ftxui::Component& filterView);
 };
 
 class CommitInfoManager {