update Popup guides

Author: dankmeme01

tutorials/popup.md

@@ -33,12 +33,14 @@ This makes working with simple confirmation popups much simpler, as you don't ha
 
 ## Complex popups
 
-However, what if you want to make a popup that's more complex? For example, something with a different background and lots of buttons and other controls, like the move trigger popup? For this, the **unrecommended** GD way is to inherit from `FLAlertLayer` and override `init` with your own code. However, this is not ideal, as most complex popups share a lot of similar base functionality like a close button and a standard `GJ_squareXX` background. For this reason, Geode provides a convenience class `Popup<...>` for creating your own complex popups.
+However, what if you want to make a popup that's more complex? For example, something with a different background and lots of buttons and other controls, like the move trigger popup? For this, the **unrecommended** GD way is to inherit from `FLAlertLayer` and override `init` with your own code. However, this is not ideal, as most complex popups share a lot of similar base functionality like a close button and a standard `GJ_squareXX` background. For this reason, Geode provides a convenience class `Popup` for creating your own complex popups.
 ```cpp
-// specify parameters for the setup function in the Popup<...> template
-class MyPopup : public geode::Popup<std::string const&> {
+class MyPopup : public geode::Popup {
 protected:
-    bool setup(std::string const& value) override {
+    bool init(std::string const& value) {
+        if (!Popup::init(240.f, 160.f))
+            return false;
+
         // convenience function provided by Popup
         // for adding/setting a title to the popup
         this->setTitle("Hi mom!");
@@ -52,7 +54,7 @@ protected:
 public:
     static MyPopup* create(std::string const& text) {
         auto ret = new MyPopup();
-        if (ret->initAnchored(240.f, 160.f, text)) {
+        if (ret->init(text)) {
             ret->autorelease();
             return ret;
         }
@@ -63,7 +65,7 @@ public:
 };
 ```
 
-`Popup` contains one pure virtual member function: `setup`, whose parameters are the class template arguments. This function is called at the end of `Popup::init`, which initializes all the relevant `FLAlertLayer` members and adds a background and a close button. This abstracts away a lot of boilerplate and makes creating complex popups simple.
+`Popup::init` abstracts away a lot of boilerplate and makes creating complex popups simple, by initializing all the relevant `FLAlertLayer` members and adding a background with a close button.
 
 **This is the recommended way to create complex popups in Geode**, although as with question popups, this is not an interoperability concern and as such **you can do what fits your case**. If you are porting an existing mod that uses some other setup and it works just fine, no need to change it unless you want to make the codebase more easily refactorable.
 

tutorials/touchpriority.md

@@ -30,8 +30,8 @@ Robtop has 3 main functions for dealing with force priority: `CCTouchDispatcher:
 
 If you're not dealing with any popups, chances are you don't need to deal with any of these either. But if you are, you should follow these guidelines.
 
-If your popup subclasses `geode::Popup<>`, the registering and unregistering is handled automatically.
+If your popup subclasses `geode::Popup`, the registering and unregistering is handled automatically.
 
-If you're not using `geode::Popup<>` class and directly subclassing `FLAlertLayer` instead, you should call `FLAlertLayer::init(int opacity)` inside your init. This will handle the registering of the force priority, along with creating the `m_mainLayer`. You should also override `registerWithTouchDispatcher` and call `CCTouchDispatcher::addTargetedDelegate` in it, since that will allow you to register the popup not as a prio targeted delegate. If you leave it the default, `FLAlertLayer` will have one less priority than your layers (-503 vs -502), meaning none of the touches will go to your layers since they will be consumed. And lastly, `~FLAlertLayer` handles unregistering of the force priority.
+If you're not using `geode::Popup` class and directly subclassing `FLAlertLayer` instead, you should call `FLAlertLayer::init(int opacity)` inside your init. This will handle the registering of the force priority, along with creating the `m_mainLayer`. You should also override `registerWithTouchDispatcher` and call `CCTouchDispatcher::addTargetedDelegate` in it, since that will allow you to register the popup not as a prio targeted delegate. If you leave it the default, `FLAlertLayer` will have one less priority than your layers (-503 vs -502), meaning none of the touches will go to your layers since they will be consumed. And lastly, `~FLAlertLayer` handles unregistering of the force priority.
 
 If you want to set the priorities manually (such as for an overlay), you can call `CCLayer::setTouchPriority`/`CCMenu::setHandlerPriority` on your layer with the `CCTouchDispatcher::getTargetPrio` value.