eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 02:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix: prevent View Terminate if not previously Initiated

Browse Source 
Ensures Action::Manager stores terminated actions only if previously initiated (caused iterative action storing on keyboard repeat).
This commit is contained in:
Bruno Herbelin
2022-04-20 16:43:42 +02:00
parent d41a85f4a1
commit c8f8fcf9d3
9 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
View.cpp
View File

@@ -43,7 +43,7 @@
uint View::need_deep_update_ = 1;
View::View(Mode m) : mode_(m), dt_(16.f)
View::View(Mode m) : mode_(m), current_action_ongoing_(false), dt_(16.f)
{
show_context_menu_ = MENU_NONE;
@@ -133,18 +133,30 @@ std::pair<Node *, glm::vec2> View::pick(glm::vec2 P)
void View::initiate()
{
current_action_ = "";
for (auto sit = Mixer::manager().session()->begin();
sit != Mixer::manager().session()->end(); ++sit)
(*sit)->store(mode_);
// initiate pending action
if (!current_action_ongoing_) {
// all sources store their status at initiation of an action
for (auto sit = Mixer::manager().session()->begin();
sit != Mixer::manager().session()->end(); ++sit)
(*sit)->store(mode_);
// initiated
current_action_ = "";
current_action_ongoing_ = true;
}
}
void View::terminate()
void View::terminate(bool force)
{
std::regex r("\\n");
current_action_ = std::regex_replace(current_action_, r, " ");
Action::manager().store(current_action_);
current_action_ = "";
// terminate pending action
if (current_action_ongoing_ || force) {
// store the terminated action in action manager (undo history)
std::regex r("\\n");
current_action_ = std::regex_replace(current_action_, r, " ");
Action::manager().store(current_action_);
// terminated
current_action_ = "";
current_action_ongoing_ = false;
}
}
void View::zoom( float factor )