Add right-aligned text to menu

include/gui.hpp

@@ -7,6 +7,14 @@
 namespace rack {
 
 
+#ifdef ARCH_MAC
+	#define MOD_KEY_NAME "Cmd"
+#else
+	#define MOD_KEY_NAME "Ctrl"
+#endif
+
+
+
 extern GLFWwindow *gWindow;
 extern NVGcontext *gVg;
 extern std::shared_ptr<Font> gGuiFont;

include/widgets.hpp

@@ -264,10 +264,11 @@ struct Menu : OpaqueWidget {
 
 struct MenuEntry : OpaqueWidget {
 	std::string text;
+	std::string rightText;
 	MenuEntry() {
 		box.size = Vec(0, BND_WIDGET_HEIGHT);
 	}
-	float computeMinWidth(NVGcontext *vg);
+	virtual float computeMinWidth(NVGcontext *vg);
 };
 
 struct MenuLabel : MenuEntry {
@@ -277,6 +278,7 @@ struct MenuLabel : MenuEntry {
 struct MenuItem : MenuEntry {
 	BNDwidgetState state = BND_DEFAULT;
 
+	float computeMinWidth(NVGcontext *vg);
 	void draw(NVGcontext *vg);
 
 	void onMouseEnter();

src/app/ModuleWidget.cpp

@@ -176,7 +176,7 @@ Widget *ModuleWidget::onHoverKey(Vec pos, int key) {
 				gRackWidget->cloneModule(this);
 			break;
 	}
-	return NULL;
+	return this;
 }
 
 void ModuleWidget::onDragStart() {
@@ -237,11 +237,13 @@ void ModuleWidget::onMouseDown(int button) {
 
 		InitializeMenuItem *resetItem = new InitializeMenuItem();
 		resetItem->text = "Initialize";
+		resetItem->rightText = MOD_KEY_NAME "+I";
 		resetItem->moduleWidget = this;
 		menu->pushChild(resetItem);
 
 		RandomizeMenuItem *randomizeItem = new RandomizeMenuItem();
 		randomizeItem->text = "Randomize";
+		randomizeItem->rightText = MOD_KEY_NAME "+R";
 		randomizeItem->moduleWidget = this;
 		menu->pushChild(randomizeItem);
 
@@ -252,11 +254,13 @@ void ModuleWidget::onMouseDown(int button) {
 
 		CloneMenuItem *cloneItem = new CloneMenuItem();
 		cloneItem->text = "Duplicate";
+		cloneItem->rightText = MOD_KEY_NAME "+D";
 		cloneItem->moduleWidget = this;
 		menu->pushChild(cloneItem);
 
 		DeleteMenuItem *deleteItem = new DeleteMenuItem();
 		deleteItem->text = "Delete";
+		deleteItem->rightText = "Backspace/Delete";
 		deleteItem->moduleWidget = this;
 		menu->pushChild(deleteItem);
 	}

src/app/RackWidget.cpp

@@ -337,7 +337,8 @@ void RackWidget::onMouseDown(int button) {
 		for (Plugin *plugin : gPlugins) {
 			for (Model *model : plugin->models) {
 				AddModuleMenuItem *item = new AddModuleMenuItem();
-				item->text = model->plugin->name + ": " + model->name;
+				item->text = model->name;
+				item->rightText = model->plugin->name;
 				item->model = model;
 				item->modulePos = modulePos;
 				menu->pushChild(item);

src/widgets/MenuEntry.cpp

@@ -3,6 +3,7 @@
 
 namespace rack {
 
+
 float MenuEntry::computeMinWidth(NVGcontext *vg) {
 	return bndLabelWidth(vg, -1, text.c_str());
 }

src/widgets/MenuItem.cpp

@@ -3,8 +3,21 @@
 
 namespace rack {
 
+
+#define RIGHT_PADDING 10.0
+#define BND_LABEL_FONT_SIZE 13
+
+float MenuItem::computeMinWidth(NVGcontext *vg) {
+	return MenuEntry::computeMinWidth(vg) + RIGHT_PADDING + bndLabelWidth(vg, -1, rightText.c_str());
+}
+
 void MenuItem::draw(NVGcontext *vg) {
 	bndMenuItem(vg, 0.0, 0.0, box.size.x, box.size.y, state, -1, text.c_str());
+
+	float x = box.size.x - bndLabelWidth(vg, -1, rightText.c_str());
+	NVGcolor rightColor = (state == BND_DEFAULT) ? bndGetTheme()->menuTheme.textColor : bndGetTheme()->menuTheme.textSelectedColor;
+	bndIconLabelValue(vg, x, 0.0, box.size.x, box.size.y, -1,
+		rightColor, BND_LEFT, BND_LABEL_FONT_SIZE, rightText.c_str(), NULL);
 }
 
 void MenuItem::onMouseEnter() {

src/widgets/MenuLabel.cpp

@@ -3,6 +3,7 @@
 
 namespace rack {
 
+
 void MenuLabel::draw(NVGcontext *vg) {
 	bndMenuLabel(vg, 0.0, 0.0, box.size.x, box.size.y, -1, text.c_str());
 }