Skip to content

Commit ed5bdf9

Browse files
committed
fix updates after promotion
1 parent 361654e commit ed5bdf9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/core/OSTreeTUI.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
4848
* For a general list of To-Dos refer to https://github.com/AP-Sensing/ostree-tui/pull/21
4949
*
5050
* TODO bug fixes:
51-
* > updates (update commit-list when promoting)
5251
* > keyboard functionality (especially in-app navigation)
5352
*/
5453

@@ -94,12 +93,12 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
9493
return true;
9594
}
9695
// switch through commits
97-
if (event == Event::ArrowUp || event == Event::Character('k')) {
96+
if (event == Event::ArrowUp) {
9897
scrollOffset = std::min(0, scrollOffset + 4);
9998
selectedCommit = -scrollOffset / 4;
10099
return true;
101100
}
102-
if (event == Event::ArrowDown || event == Event::Character('j')) {
101+
if (event == Event::ArrowDown) {
103102
scrollOffset -= 4;
104103
selectedCommit = -scrollOffset / 4;
105104
return true;
@@ -160,10 +159,9 @@ OSTreeTUI::OSTreeTUI (const std::string& repo, const std::vector<std::string> st
160159
return true;
161160
}
162161
// refresh repository
163-
if (event == Event::AltR || refresh) {
162+
if (event == Event::AltR) {
164163
refresh_repository();
165164
notificationText = " Refreshed Repository Data ";
166-
refresh = false;
167165
return true;
168166
}
169167
// exit

src/core/OSTreeTUI.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,9 @@ class OSTreeTUI {
7474
// view states
7575
int scrollOffset{0};
7676
bool inPromotionSelection{false};
77-
bool refresh{false};
7877
std::string promotionHash{""};
7978
std::string promotionBranch{""};
8079

81-
private:
8280
// view constants
8381
int logSize{45};
8482
int footerSize{1};

src/core/commit.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
154154
ostreetui.ostreeRepo.promoteCommit(hash, ostreetui.promotionBranch, {}, newSubject, true);
155155
resetWindow();
156156
ostreetui.inPromotionSelection = false;
157-
ostreetui.refresh = true;
157+
ostreetui.scrollOffset = 0;
158+
ostreetui.selectedCommit = 0;
159+
ostreetui.screen.PostEvent(Event::AltR);
158160
return true;
159161
}
160162
// cancel
@@ -336,7 +338,9 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
336338
}
337339
ostreetui.ostreeRepo.promoteCommit(hash, ostreetui.promotionBranch, metadataStrings, newSubject, true);
338340
resetWindow();
339-
ostreetui.refresh = true;
341+
ostreetui.scrollOffset = 0;
342+
ostreetui.selectedCommit = 0;
343+
ostreetui.screen.PostEvent(Event::AltR);
340344
}) | color(Color::Green) | flex,
341345
})
342346
});

0 commit comments

Comments
 (0)