|
@@ -530,18 +530,6 @@ OptionsMenu::OptionsMenu() : ScreenBackable() {
|
|
|
|
|
|
CBaseUIElement *sectionGeneral = addSection("General");
|
|
|
|
|
|
- addSubSection("");
|
|
|
- UIButton *downloadOsuButton = addButton("Download osu! and get some beatmaps!");
|
|
|
- downloadOsuButton->setClickCallback(fastdelegate::MakeDelegate(this, &OptionsMenu::onDownloadOsuClicked));
|
|
|
- downloadOsuButton->setColor(0xff00ff00);
|
|
|
- downloadOsuButton->setTextColor(0xffffffff);
|
|
|
-
|
|
|
- addLabel("... or ...")->setCenterText(true);
|
|
|
- UIButton *manuallyManageBeatmapsButton = addButton("Manually manage beatmap files?");
|
|
|
- manuallyManageBeatmapsButton->setClickCallback(
|
|
|
- fastdelegate::MakeDelegate(this, &OptionsMenu::onManuallyManageBeatmapsClicked));
|
|
|
- manuallyManageBeatmapsButton->setColor(0xff10667b);
|
|
|
-
|
|
|
addSubSection("osu!folder");
|
|
|
addLabel("1) If you have an existing osu! installation:")->setTextColor(0xff666666);
|
|
|
addLabel("2) osu! > Options > \"Open osu! folder\"")->setTextColor(0xff666666);
|
|
@@ -1003,6 +991,7 @@ OptionsMenu::OptionsMenu() : ScreenBackable() {
|
|
|
addKeyBindButton("Increase Volume", &KeyBindings::INCREASE_VOLUME);
|
|
|
addKeyBindButton("Decrease Volume", &KeyBindings::DECREASE_VOLUME);
|
|
|
addKeyBindButton("Disable Mouse Buttons", &KeyBindings::DISABLE_MOUSE_BUTTONS);
|
|
|
+ addKeyBindButton("Toggle Map Background", &KeyBindings::TOGGLE_MAP_BACKGROUND);
|
|
|
addKeyBindButton("Boss Key (Minimize)", &KeyBindings::BOSS_KEY);
|
|
|
addSubSection("Keys - Song Select", keyboardSectionTags);
|
|
|
addKeyBindButton("Toggle Mod Selection Screen", &KeyBindings::TOGGLE_MODSELECT)
|
|
@@ -1446,8 +1435,13 @@ void OptionsMenu::draw(Graphics *g) {
|
|
|
if(!isPlayingBeatmap) osu->getHUD()->drawDummy(g);
|
|
|
} else if(m_playfieldBorderSizeSlider->isActive()) {
|
|
|
osu->getHUD()->drawPlayfieldBorder(g, GameRules::getPlayfieldCenter(), GameRules::getPlayfieldSize(), 100);
|
|
|
- } else
|
|
|
+ } else {
|
|
|
ScreenBackable::draw(g);
|
|
|
+ }
|
|
|
+
|
|
|
+ // Re-drawing context menu to make sure it's drawn on top of the back button
|
|
|
+ // Context menu input still gets processed first, so this is fine
|
|
|
+ m_contextMenu->draw(g);
|
|
|
|
|
|
if(m_cursorSizeSlider->getFloat() < 0.15f) engine->getMouse()->drawDebug(g);
|
|
|
|
|
@@ -2641,16 +2635,6 @@ void OptionsMenu::onLogInClicked() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void OptionsMenu::onDownloadOsuClicked() {
|
|
|
- osu->getNotificationOverlay()->addNotification("Opening browser, please wait ...", 0xffffffff, false, 0.75f);
|
|
|
- env->openURLInDefaultBrowser("https://osu.ppy.sh/");
|
|
|
-}
|
|
|
-
|
|
|
-void OptionsMenu::onManuallyManageBeatmapsClicked() {
|
|
|
- osu->getNotificationOverlay()->addNotification("Opening browser, please wait ...", 0xffffffff, false, 0.75f);
|
|
|
- env->openURLInDefaultBrowser("https://steamcommunity.com/sharedfiles/filedetails/?id=880768265");
|
|
|
-}
|
|
|
-
|
|
|
void OptionsMenu::onCM360CalculatorLinkClicked() {
|
|
|
osu->getNotificationOverlay()->addNotification("Opening browser, please wait ...", 0xffffffff, false, 0.75f);
|
|
|
env->openURLInDefaultBrowser("https://www.mouse-sensitivity.com/");
|