improve commit scrolling and selection

Author: forgottosave

src/core/OSTreeTUI.cpp

@@ -79,28 +79,15 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
 
 	// window specific shortcuts
 	commitListComponent = CatchEvent(commitListComponent, [&](Event event) {
-		// scroll
-    	if (event.is_mouse() && event.mouse().button == Mouse::WheelUp) {
-    	  	if (scrollOffset < 0) {
-				++scrollOffset;
-			}
-			selectedCommit = (-scrollOffset + CommitRender::COMMIT_WINDOW_HEIGHT - 1) / CommitRender::COMMIT_WINDOW_HEIGHT;
-			return true;
-    	}
-    	if (event.is_mouse() && event.mouse().button == Mouse::WheelDown) {
-    	  	--scrollOffset;
-			selectedCommit = (-scrollOffset + CommitRender::COMMIT_WINDOW_HEIGHT - 1) / CommitRender::COMMIT_WINDOW_HEIGHT;
-			return true;
-    	}
 		// switch through commits
-    	if (event == Event::ArrowUp) {
-			scrollOffset = std::min(0, scrollOffset + CommitRender::COMMIT_WINDOW_HEIGHT);
-			selectedCommit = -scrollOffset / CommitRender::COMMIT_WINDOW_HEIGHT;
+    	if (event == Event::ArrowUp || (event.is_mouse() && event.mouse().button == Mouse::WheelUp)) {
+			selectedCommit = std::max(0, static_cast<int>(selectedCommit) - 1);
+			adjustScrollToSelectedCommit();
 			return true;
     	}
-    	if (event == Event::ArrowDown) {
-    	  	scrollOffset -= CommitRender::COMMIT_WINDOW_HEIGHT;
-			selectedCommit = -scrollOffset / CommitRender::COMMIT_WINDOW_HEIGHT;
+    	if (event == Event::ArrowDown || (event.is_mouse() && event.mouse().button == Mouse::WheelDown)) {
+    	  	selectedCommit = std::min(selectedCommit + 1, getVisibleCommitViewMap().size() - 1);
+			adjustScrollToSelectedCommit();
 			return true;
     	}
 		return false;
@@ -290,11 +277,41 @@ std::vector<std::string> OSTreeTUI::parseVisibleCommitMap(cpplibostree::OSTreeRe
 	return visibleCommitViewMap;
 }
 
+void OSTreeTUI::adjustScrollToSelectedCommit() {
+	// try to scroll it to the middle
+	int windowHeight = screen.dimy() - 4;
+	int scollOffsetToFitCommitToTop = - selectedCommit * CommitRender::COMMIT_WINDOW_HEIGHT;
+	int newScroll = scollOffsetToFitCommitToTop + windowHeight / 2 - CommitRender::COMMIT_WINDOW_HEIGHT;
+	// adjust if on edges
+	int min = 0;
+	int max = - windowHeight - static_cast<int>(visibleCommitViewMap.size() - 1) * CommitRender::COMMIT_WINDOW_HEIGHT;
+	scrollOffset = std::max(newScroll, max);
+	scrollOffset = std::min(min, newScroll);
+}
+
+void OSTreeTUI::adjustSelectedCommitToScroll() {
+	int yToFit = selectedCommit * CommitRender::COMMIT_WINDOW_HEIGHT;
+	int maxVal = screen.dimy() - 4 - CommitRender::COMMIT_WINDOW_HEIGHT - scrollOffset;
+	int minVal = -scrollOffset;
+
+	if (yToFit > maxVal) {
+		--selectedCommit;
+	}
+	if (yToFit < minVal) {
+		++selectedCommit;
+	}
+}
+
 // SETTER & non-const GETTER
 void OSTreeTUI::setPromotionBranch(std::string promotionBranch) {
 	this->promotionBranch = promotionBranch;
 }
 
+void OSTreeTUI::setSelectedCommit(size_t selectedCommit) {
+	this->selectedCommit = selectedCommit;
+	adjustScrollToSelectedCommit();
+}
+
 std::vector<std::string>& OSTreeTUI::getColumnToBranchMap() {
 	return columnToBranchMap;
 }

src/core/OSTreeTUI.hpp

@@ -71,9 +71,22 @@ class OSTreeTUI {
      */
     std::vector<std::string> parseVisibleCommitMap(cpplibostree::OSTreeRepo& repo, std::unordered_map<std::string, bool>& visibleBranches);
 
+    /**
+     * @brief Adjust scroll offset to fit the selected commit
+     */
+    void adjustScrollToSelectedCommit();
+
+    /**
+     * @brief Adjust selected commit to fit to scroll commit (minimal adjustment of last selected)
+     * 
+     * Warning: Currently only adjusts by 1
+     */
+    void adjustSelectedCommitToScroll();
+
 public:
     // "SETTER" & non-const GETTER
     void setPromotionBranch(std::string promotionBranch);
+    void setSelectedCommit(size_t selectedCommit);
     std::vector<std::string>& getColumnToBranchMap();
 
     // GETTER

src/core/commit.cpp

@@ -70,7 +70,8 @@ Element DefaultRenderState(const WindowRenderState& state, ftxui::Color selected
 class CommitComponentImpl : public ComponentBase, public WindowOptions {
 public:
 	explicit CommitComponentImpl(int position, std::string commit, OSTreeTUI& ostreetui) :
-        hash(std::move(commit)),
+        commitPosition(position),
+		hash(std::move(commit)),
 		ostreetui(ostreetui),
 		commit(ostreetui.getOstreeRepo().getCommitList().at(hash)),
 		newVersion(this->commit.version),
@@ -151,7 +152,7 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
     	    drag_
     	};
 
-		if (drag_initial_y / COMMIT_WINDOW_HEIGHT == ostreetui.getSelectedCommit()) { // selected 
+		if (commitPosition == ostreetui.getSelectedCommit()) { // selected 
     		element = render ? render(state) : DefaultRenderState(state, ostreetui.getBranchColorMap().at(commit.branch));
 		} else {
 			element = render ? render(state) : DefaultRenderState(state);
@@ -202,6 +203,11 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
     		return true;
     	}
 
+		if (event.mouse().button == Mouse::Left) {
+			// update ostreetui
+			ostreetui.setSelectedCommit(commitPosition);
+		}
+
     	mouse_hover_ = box_window_.Contain(event.mouse().x, event.mouse().y);
 		// potentially indicate mouse hover
     	//if (box_window_.Contain(event.mouse().x, event.mouse().y)) {}
@@ -223,7 +229,7 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
     		if (drag_) {
     	    	left() = event.mouse().x - drag_start_x - box_.x_min;
     	    	top() = event.mouse().y - drag_start_y - box_.y_min;
-    	    	// promotion
+				// potential promotion
 				ostreetui.setPromotionMode(true, hash, false);
     	    	// calculate which branch currently is hovered over
     	    	ostreetui.setPromotionBranch("");
@@ -301,6 +307,7 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
 	bool drag_ = false;
 
 	// ostree-tui specific members
+	int commitPosition;
 	std::string hash;
 	OSTreeTUI& ostreetui;