New feature: we add a fourth state - we had fav, hidden, and neither (undecided), but we want to track that a patch has been revisited and is not fav. Calling this regular.

Author: christofmuc

MidiKraft

@@ -80,6 +80,7 @@ CurrentPatchDisplay::CurrentPatchDisplay(midikraft::PatchDatabase &database, std
 	})
 	, propertyEditor_(true)
 	, favorite_("Fav!")
+	, regular_("Regular")
 	, hide_("Hide")
 	, metaData_(categories, [this](CategoryButtons::Category categoryClicked, TouchButtonFunction f) {
 		categoryUpdated(categoryClicked, f);
@@ -96,6 +97,11 @@ CurrentPatchDisplay::CurrentPatchDisplay(midikraft::PatchDatabase &database, std
 	favorite_.setColour(TextButton::ColourIds::buttonOnColourId, Colour::fromString("ffffa500"));
 	addAndMakeVisible(favorite_);
 
+	regular_.setClickingTogglesState(true);
+	regular_.addListener(this);
+	regular_.setColour(TextButton::ColourIds::buttonOnColourId, Colours::cornflowerblue);
+	addAndMakeVisible(regular_);
+
 	hide_.setClickingTogglesState(true);
 	hide_.addListener(this);
 	hide_.setColour(TextButton::ColourIds::buttonOnColourId, Colours::indianred);
@@ -137,6 +143,7 @@ void CurrentPatchDisplay::setCurrentPatch(std::shared_ptr<midikraft::PatchHolder
 		setupPatchProperties(patch);
 		refreshNameButtonColour();
 		favorite_.setToggleState(patch->isFavorite(), dontSendNotification);
+		regular_.setToggleState(patch->isRegular(), dontSendNotification);
 		hide_.setToggleState(patch->isHidden(), dontSendNotification);
 
 		refreshCategories();
@@ -334,6 +341,7 @@ void CurrentPatchDisplay::reset()
 	metaDataValues_.clear();
 	layerNameValues_.clear();
 	favorite_.setToggleState(false, dontSendNotification);
+	regular_.setToggleState(false, dontSendNotification);
 	hide_.setToggleState(false, dontSendNotification);
 	metaData_.setActive({});
 	metaData_.setPatchText(nullptr);
@@ -361,8 +369,9 @@ void CurrentPatchDisplay::resized()
 		fb.flexDirection = FlexBox::Direction::row;
 		fb.justifyContent = FlexBox::JustifyContent::center;
 		fb.items.add(FlexItem(favorite_).withMinHeight(LAYOUT_TOUCHBUTTON_HEIGHT).withMinWidth(LAYOUT_BUTTON_WIDTH_MIN));
+		fb.items.add(FlexItem(regular_).withMinHeight(LAYOUT_TOUCHBUTTON_HEIGHT).withMinWidth(LAYOUT_BUTTON_WIDTH_MIN));
 		fb.items.add(FlexItem(hide_).withMinHeight(LAYOUT_TOUCHBUTTON_HEIGHT).withMinWidth(LAYOUT_BUTTON_WIDTH_MIN));
-		auto spaceNeeded = FlexBoxHelper::determineSizeForButtonLayout(this, this, { &favorite_, &hide_ }, nextRow);
+		auto spaceNeeded = FlexBoxHelper::determineSizeForButtonLayout(this, this, { &favorite_, &regular_, &hide_ }, nextRow);
 		fb.performLayout(spaceNeeded.toNearestInt());
 		area.removeFromTop((int) spaceNeeded.getHeight());
 
@@ -383,6 +392,7 @@ void CurrentPatchDisplay::resized()
 
 		// Right side - hide and favorite button
 		hide_.setBounds(rightCorner.removeFromRight(100));
+		regular_.setBounds(rightCorner.removeFromRight(100));
 		favorite_.setBounds(rightCorner.removeFromRight(100));
 
 		//TODO - Need to setup property table
@@ -399,18 +409,37 @@ void CurrentPatchDisplay::resized()
 
 void CurrentPatchDisplay::buttonClicked(Button *button)
 {
-	if (currentPatch_) {
+	if (currentPatch_ && currentPatch_->patch()) {
 		if (button == &favorite_) {
-			if (currentPatch_->patch()) {
-				currentPatch_->setFavorite(midikraft::Favorite(button->getToggleState()));
-				favoriteHandler_(currentPatch_);
+			currentPatch_->setFavorite(midikraft::Favorite(favorite_.getToggleState()));
+			if (favorite_.getToggleState() && regular_.getToggleState()) {
+				regular_.setToggleState(false, dontSendNotification);
+				currentPatch_->setRegular(false);
 			}
+			favoriteHandler_(currentPatch_);
 		}
 		else if (button == &hide_) {
-			if (currentPatch_->patch()) {
-				currentPatch_->setHidden(hide_.getToggleState());
-				favoriteHandler_(currentPatch_);
+			currentPatch_->setHidden(hide_.getToggleState());
+			if (hide_.getToggleState() && regular_.getToggleState()) {
+				regular_.setToggleState(false, dontSendNotification);
+				currentPatch_->setRegular(false);
 			}
+			favoriteHandler_(currentPatch_);
+		}
+		else if (button == &regular_) {
+			bool newState = regular_.getToggleState();
+			currentPatch_->setRegular(newState);
+			if (newState) {
+				if (favorite_.getToggleState()) {
+					favorite_.setToggleState(false, dontSendNotification);
+					currentPatch_->setFavorite(midikraft::Favorite());
+				}
+				if (hide_.getToggleState()) {
+					hide_.setToggleState(false, dontSendNotification);
+					currentPatch_->setHidden(false);
+				}
+			}
+			favoriteHandler_(currentPatch_);
 		}
 	}
 }
@@ -427,6 +456,13 @@ void CurrentPatchDisplay::toggleFavorite()
 	}
 }
 
+void CurrentPatchDisplay::toggleRegular()
+{
+	if (currentPatch_ && currentPatch_->patch()) {
+		regular_.setToggleState(!regular_.getToggleState(), sendNotificationAsync);
+	}
+}
+
 void CurrentPatchDisplay::toggleHide()
 {
 	if (currentPatch_ && currentPatch_->patch()) {

The-Orm/CurrentPatchDisplay.cpp

@@ -61,6 +61,7 @@ class CurrentPatchDisplay : public Component,
 	// For remote control via MidiKeyboard
 	void toggleFavorite();
 	void toggleHide();
+	void toggleRegular();
 
 	// Override to allow custom colour
 	virtual void paint(Graphics& g) override;
@@ -78,6 +79,7 @@ class CurrentPatchDisplay : public Component,
 	PropertyEditor propertyEditor_;
 	String lastOpenState_;
 	TextButton favorite_;
+	TextButton regular_;
 	TextButton hide_;
 	Viewport metaDataScroller_;
 	MetaDataArea metaData_;

The-Orm/CurrentPatchDisplay.h

@@ -108,6 +108,10 @@ PatchSearchComponent::PatchSearchComponent(PatchView* patchView, PatchButtonPane
 	showHidden_.onClickMultifunction = [this](TouchButtonFunction f) { refreshWithFunction(f, showHidden_); };
 	addAndMakeVisible(showHidden_);
 
+	showRegular_.setButtonText("Regular");
+	showRegular_.onClickMultifunction = [this](TouchButtonFunction f) { refreshWithFunction(f, showRegular_); };
+	addAndMakeVisible(showRegular_);
+
 	showUndecided_.setButtonText("Undecided");
 	showUndecided_.onClickMultifunction = [this](TouchButtonFunction f) { refreshWithFunction(f, showUndecided_); };
 	addAndMakeVisible(showUndecided_);
@@ -242,6 +246,7 @@ void PatchSearchComponent::resized()
 	fb.alignContent = FlexBox::AlignContent::flexStart; // This is cross axis, up
 	fb.items.add(createFlexButton(&onlyFaves_));
 	fb.items.add(createFlexButton(&showHidden_));
+	fb.items.add(createFlexButton(&showRegular_));
 	fb.items.add(createFlexButton(&showUndecided_));
 	fb.items.add(createFlexButton(&onlyUntagged_));
 	fb.items.add(createFlexButton(&onlyDuplicates_));
@@ -282,6 +287,7 @@ void PatchSearchComponent::loadFilter(midikraft::PatchFilter filter) {
 	onlyFaves_.setToggleState(filter.onlyFaves, dontSendNotification);
 	onlyUntagged_.setToggleState(filter.onlyUntagged, dontSendNotification);
 	showHidden_.setToggleState(filter.showHidden, dontSendNotification);
+	showRegular_.setToggleState(filter.showRegular, dontSendNotification);
 	showUndecided_.setToggleState(filter.showUndecided, dontSendNotification);
 	onlyDuplicates_.setToggleState(filter.onlyDuplicateNames, dontSendNotification);
 	andCategories_.setToggleState(filter.andCategories, dontSendNotification);
@@ -372,6 +378,7 @@ midikraft::PatchFilter PatchSearchComponent::buildFilter() const
 	filter.onlySpecifcType = typeSelected;
 	filter.typeID = filterType;
 	filter.showHidden = showHidden_.getToggleState();
+	filter.showRegular = showRegular_.getToggleState();
 	filter.showUndecided = showUndecided_.getToggleState();
 	filter.onlyUntagged = onlyUntagged_.getToggleState();
 	filter.categories = catSelected;

The-Orm/PatchSearchComponent.cpp

@@ -49,6 +49,7 @@ class PatchSearchComponent : public Component, private ChangeListener
 	CategoryButtons categoryFilters_;
 	TouchToggleButton onlyFaves_;
 	TouchToggleButton showHidden_;
+	TouchToggleButton showRegular_;
 	TouchToggleButton showUndecided_;
 	TouchToggleButton onlyUntagged_;
 	TouchToggleButton onlyDuplicates_;