Prepare commit-tree rebuild

Author: forgottosave

src/core/OSTreeTUI.cpp

@@ -142,20 +142,28 @@ int OSTreeTUI::main(const std::string& repo, const std::vector<std::string>& sta
 	// interchangeable view (composed)
 	Manager manager(infoView, filterView, promotionView);
   	Component managerRenderer = manager.managerRenderer;
-	
-	// COMMIT TREE
-	Component logRenderer = Scroller(&selectedCommit, CommitRender::COMMIT_DETAIL_LEVEL, Renderer([&] {
-		visibleCommitViewMap = parseVisibleCommitMap(ostreeRepo, visibleBranches);
-		selectedCommit = std::min(selectedCommit, visibleCommitViewMap.size() - 1);
-		return CommitRender::commitRender(ostreeRepo, visibleCommitViewMap, visibleBranches, branchColorMap, selectedCommit);
-	}));
 
 	// FOOTER
 	Footer footer;
   	Component footerRenderer = Renderer([&] {
 		return footer.footerRender();
 	});
 
+	// COMMIT TREE
+/* TODO - The commit-tree is currentrly under a heavy rebuild, see implementation To-Dos below.
+ * 	      For a general list of To-Dos refer to https://github.com/AP-Sensing/ostree-tui/pull/21
+ * 
+ * > Component commitTree should be a Stacked(...) to allow for snappy windows to be arranged with
+ *   a drag & drop funcitonality.
+ * > Snappy Windows should be an abstracted element, similar to windows, but snapping back to their
+ *   place after being dropped.
+ */
+	Component logRenderer = Scroller(&selectedCommit, CommitRender::COMMIT_DETAIL_LEVEL, Renderer([&] {
+		visibleCommitViewMap = parseVisibleCommitMap(ostreeRepo, visibleBranches);
+		selectedCommit = std::min(selectedCommit, visibleCommitViewMap.size() - 1);
+		return CommitRender::commitRender(ostreeRepo, visibleCommitViewMap, visibleBranches, branchColorMap, selectedCommit);
+	}));
+
 	// window specific shortcuts
 	logRenderer = CatchEvent(logRenderer, [&](Event event) {
 		// switch through commits
@@ -168,6 +176,11 @@ int OSTreeTUI::main(const std::string& repo, const std::vector<std::string>& sta
 		return false;
 	});
 
+/*
+ * END of commit-tree TODO
+ * Probably shouldn't have to change anything outside of this. 
+ */
+
   	int logSize{45};
   	int footerSize{1};
   	Component container{managerRenderer};

src/util/snappyWindow.cpp

@@ -0,0 +1,34 @@
+#include "scroller.hpp"
+
+#include <algorithm>                         	// for max, min
+#include <ftxui/component/component_base.hpp>	// for Component, ComponentBase
+#include <ftxui/component/event.hpp> 			// for Event, Event::ArrowDown, Event::ArrowUp, Event::End, Event::Home, Event::PageDown, Event::PageUp
+#include <utility>								// for move
+
+#include "ftxui/component/component.hpp"// for Make
+#include "ftxui/component/mouse.hpp"	// for Mouse, Mouse::WheelDown, Mouse::WheelUp
+#include "ftxui/dom/deprecated.hpp"		// for text
+#include "ftxui/dom/elements.hpp"		// for operator|, Element, size, vbox, EQUAL, HEIGHT, dbox, reflect, focus, inverted, nothing, select, vscroll_indicator, yflex, yframe
+#include "ftxui/dom/node.hpp"			// for Node
+#include "ftxui/dom/requirement.hpp"	// for Requirement
+#include "ftxui/screen/box.hpp"			// for Box
+
+namespace ftxui {
+
+class SnappyWindowBase : public ComponentBase {
+public:
+	SnappyWindowBase() {}
+
+private:
+	Element Render() final {
+    	return text("not implemented yet");
+	}
+
+	bool Focusable() const final { return true; }
+};
+
+Component SnappyWindow() {
+	return Make<SnappyWindowBase>();
+}
+
+}  // namespace ftxui

src/util/snappyWindow.hpp

@@ -0,0 +1,23 @@
+#ifndef SCROLLER_H
+#define SCROLLER_H
+
+#include <ftxui/component/component.hpp>
+
+#include "ftxui/component/component_base.hpp"  // for Component
+
+namespace ftxui {
+    /**
+     * @brief This Scroller Element is a modified version of the Scroller in the following repository:
+     *    Title: git-tui
+     *    Author: Arthur Sonzogni
+     *    Date: 2021
+     *    Availability: https://github.com/ArthurSonzogni/git-tui/blob/master/src/scroller.cpp
+     *
+     * @param selectedCommit 
+     * @param child 
+     * @return Component
+     */
+    Component SnappyWindow(size_t *selectedCommit, size_t elementLength, Component child);
+
+} // namespace ftxui
+#endif /* end of include guard: SCROLLER_H */