Replace menu Debug checkbox with Debug shortcut.

(press D on menu to get debug options)
FranciscoDA · Mar 17, 2019 · e351651 · e351651
1 parent a0de971
commit e351651
Show file tree

Hide file tree

Showing 6 changed files with 128 additions and 129 deletions.
diff --git a/data/forms/mainmenu.form b/data/forms/mainmenu.form
@@ -16,12 +16,6 @@
           <alignment horizontal="centre" vertical="centre"/>
           <font>bigfont</font>
         </label>
-        <label text="Debug Mode">
-          <position x="410" y="bottom"/>
-          <size width="200" height="16"/>
-          <alignment horizontal="right" vertical="centre"/>
-          <font>smallset</font>
-        </label>
         <label text="Version" id="VERSION_LABEL">
           <position x="0" y="0"/>
           <size width="640" height="16"/>

diff --git a/forms/control.cpp b/forms/control.cpp
@@ -322,8 +322,9 @@ void Control::eventOccured(Event *e)
 				}
 				fw().renderer->draw(textImage, {totalBorder, totalBorder});
 
-				fw().showToolTip(surface, pos + resolvedLocation -
-				                              Vec2<int>{surface->size.x / 2, surface->size.y});
+				fw().showToolTip(surface,
+				                 pos + resolvedLocation -
+				                     Vec2<int>{surface->size.x / 2, surface->size.y});
 			}
 		}
 	}

diff --git a/game/ui/base/vequipscreen.cpp b/game/ui/base/vequipscreen.cpp
@@ -78,15 +78,15 @@ VEquipScreen::VEquipScreen(sp<GameState> state)
 			    this->selected->name =
 			        std::dynamic_pointer_cast<TextEdit>(e->forms().RaisedBy)->getText();
 		    }
-	    });
+		});
 	form->findControlTyped<TextEdit>("TEXT_VEHICLE_NAME")
 	    ->addCallback(FormEventType::TextEditCancel, [this](FormsEvent *e) {
 		    if (this->selected)
 		    {
 			    std::dynamic_pointer_cast<TextEdit>(e->forms().RaisedBy)
 			        ->setText(this->selected->name);
 		    }
-	    });
+		});
 
 	this->paperDoll->setNonHighlightColour(EQUIP_GRID_COLOUR);
 	this->setHighlightedSlotType(EquipmentSlotType::VehicleWeapon);

diff --git a/game/ui/general/mainmenu.cpp b/game/ui/general/mainmenu.cpp
@@ -23,6 +23,10 @@ MainMenu::MainMenu() : Stage(), mainmenuform(ui().getForm("mainmenu"))
 {
 	auto versionLabel = mainmenuform->findControlTyped<Label>("VERSION_LABEL");
 	versionLabel->setText(OPENAPOC_VERSION);
+#ifndef NDEBUG
+	auto debugButton = mainmenuform->findControlTyped<Control>("BUTTON_DEBUG");
+	debugButton->setVisible(true);
+#endif
 }
 
 MainMenu::~MainMenu() = default;
@@ -46,6 +50,11 @@ void MainMenu::eventOccurred(Event *e)
 			fw().stageQueueCommand({StageCmd::Command::QUIT});
 			return;
 		}
+		if (e->keyboard().KeyCode == SDLK_d)
+		{
+			fw().stageQueueCommand({StageCmd::Command::PUSH, mksp<DebugMenu>()});
+			return;
+		}
 	}
 
 	if (e->type() == EVENT_FORM_INTERACTION && e->forms().EventFlag == FormEventType::ButtonClick)