Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Chordian/sidfactory2 into…
Browse files Browse the repository at this point in the history
… master
  • Loading branch information
TheRealLaxity committed Nov 18, 2021
2 parents f3d79cf + 6837107 commit 3b30d93
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,11 @@ namespace Editor
return !IsEditingText();
}

void ComponentOrderListOverview::ClearHasControl(CursorControl& inCursorControl)
{
if(IsEditingText())
DoStopEditText(inCursorControl, false);
}

void ComponentOrderListOverview::ExecuteInsertDeleteRule(const DriverInfo::TableInsertDeleteRule& inRule, int inSourceTableID, int inIndexPre, int inIndexPost)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ namespace Editor

bool IsNoteInputSilenced() const override;
bool IsFastForwardAllowed() const override;
void ClearHasControl(CursorControl& inCursorControl) override;

void ExecuteInsertDeleteRule(const DriverInfo::TableInsertDeleteRule& inRule, int inSourceTableID, int inIndexPre, int inIndexPost) override;
void ExecuteAction(int inActionInput) override;
Expand Down

0 comments on commit 3b30d93

Please sign in to comment.