From b6aba4d66a3b829edfb38cfc15ed023d252d7c07 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 31 May 2021 11:28:37 -0400 Subject: [PATCH] Fix menu item right text font size. --- src/app/MenuBar.cpp | 24 ++++++++++++------------ src/ui/MenuItem.cpp | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/MenuBar.cpp b/src/app/MenuBar.cpp index 4130d149..f96ee694 100644 --- a/src/app/MenuBar.cpp +++ b/src/app/MenuBar.cpp @@ -529,18 +529,6 @@ struct ViewButton : MenuButton { tooltipsItem->rightText = CHECKMARK(settings::tooltips); menu->addChild(tooltipsItem); - FrameRateItem* frameRateItem = new FrameRateItem; - frameRateItem->text = "Frame rate"; - frameRateItem->rightText = RIGHT_ARROW; - menu->addChild(frameRateItem); - - FullscreenItem* fullscreenItem = new FullscreenItem; - fullscreenItem->text = "Fullscreen"; - fullscreenItem->rightText = "F11"; - if (APP->window->isFullScreen()) - fullscreenItem->rightText = CHECKMARK_STRING " " + fullscreenItem->rightText; - menu->addChild(fullscreenItem); - ZoomSlider* zoomSlider = new ZoomSlider; zoomSlider->box.size.x = 250.0; menu->addChild(zoomSlider); @@ -560,6 +548,18 @@ struct ViewButton : MenuButton { HaloBrightnessSlider* haloBrightnessSlider = new HaloBrightnessSlider; haloBrightnessSlider->box.size.x = 250.0; menu->addChild(haloBrightnessSlider); + + FrameRateItem* frameRateItem = new FrameRateItem; + frameRateItem->text = "Frame rate"; + frameRateItem->rightText = RIGHT_ARROW; + menu->addChild(frameRateItem); + + FullscreenItem* fullscreenItem = new FullscreenItem; + fullscreenItem->text = "Fullscreen"; + fullscreenItem->rightText = "F11"; + if (APP->window->isFullScreen()) + fullscreenItem->rightText = CHECKMARK_STRING " " + fullscreenItem->rightText; + menu->addChild(fullscreenItem); } }; diff --git a/src/ui/MenuItem.cpp b/src/ui/MenuItem.cpp index 36efe52c..1ea24fca 100644 --- a/src/ui/MenuItem.cpp +++ b/src/ui/MenuItem.cpp @@ -6,7 +6,7 @@ namespace rack { namespace ui { -#define BND_LABEL_FONT_SIZE 13 +#define BND_LABEL_FONT_SIZE 11 void MenuItem::draw(const DrawArgs& args) {