MenuPowers: Add upgrade_button_offset property

This setting allows overriding where the upgrade buttons get placed. If
not set, the old behavior of placing them to the right of the icons is
used.

Author: dorkster

RELEASE_NOTES.txt

@@ -26,6 +26,7 @@ Engine features:
 * Power 'trait_elemental' now works with all damage types (despite the name). Any additional damage bonuses for the specified damage type will apply on top of the converted damage.
 * Added 'tab.text_padding' to engine/widget_settings.txt config.
 * Added 'enabled' property to Char/Inv/Pow/Log menus for modders that wish to prevent the player from opening those menus.
+* Added 'upgrade_button_offset' property to menu/powers.txt config.
 * Android: Enabled use of external input devices (gamepads, keyboards, mice)
 
 Engine fixes:

docs/attribute-reference.html

@@ -1486,6 +1486,8 @@ <h4>Menu</h4>
 
 <p><strong>background</strong> | <code>filename</code> | Filename of the background image for this menu.</p>
 
+<p><strong>enabled</strong> | <code>bool</code> | Used to toggle the ability to open this menu. Only used for Character, Inventory, Powers, and Log menus.</p>
+
 <hr />
 
 <h4>MenuDevConsole</h4>
@@ -1670,6 +1672,8 @@ <h4>MenuPowers: Menu layout</h4>
 
 <p><strong>tab_area</strong> | <code>rectangle</code> | Position and dimensions of the tree pages.</p>
 
+<p><strong>upgrade_button_offset</strong> | <code>point</code> | X/Y offset of the upgrade button relative to each power icon. Defaults to (ICON_SIZE, 0)</p>
+
 <hr />
 
 <h4>MenuPowers: Power tree layout</h4>

src/MenuPowers.cpp

@@ -123,6 +123,7 @@ MenuPowers::MenuPowers()
 	, tab_control(NULL)
 	, tree_loaded(false)
 	, default_power_tab(-1)
+	, upgrade_button_offset(eset->resolutions.icon_size, 0)
 	, newPowerNotification(false)
 {
 
@@ -148,6 +149,8 @@ MenuPowers::MenuPowers()
 			else if (infile.key == "close") close_pos = Parse::toPoint(infile.val);
 			// @ATTR tab_area|rectangle|Position and dimensions of the tree pages.
 			else if (infile.key == "tab_area") tab_area = Parse::toRect(infile.val);
+			// @ATTR upgrade_button_offset|point|X/Y offset of the upgrade button relative to each power icon. Defaults to (ICON_SIZE, 0)
+			else if (infile.key == "upgrade_button_offset") upgrade_button_offset = Parse::toPoint(infile.val);
 
 			else infile.error("MenuPowers: '%s' is not a valid key.", infile.key.c_str());
 		}
@@ -349,7 +352,7 @@ void MenuPowers::loadPowerTree(const std::string &filename) {
 			}
 
 			if (power_cell[i].upgrade_button != NULL) {
-				power_cell[i].upgrade_button->setBasePos(power_cell[i].pos.x + eset->resolutions.icon_size, power_cell[i].pos.y, Utils::ALIGN_TOPLEFT);
+				power_cell[i].upgrade_button->setBasePos(power_cell[i].pos.x + upgrade_button_offset.x, power_cell[i].pos.y + upgrade_button_offset.y, Utils::ALIGN_TOPLEFT);
 			}
 		}
 	}

src/MenuPowers.h

@@ -155,6 +155,8 @@ class MenuPowers : public Menu {
 
 	int default_power_tab;
 
+	Point upgrade_button_offset;
+
 	std::vector<MenuPowersCell*> recently_locked_cells;
 
 public:

src/Version.cpp

@@ -30,7 +30,7 @@ FLARE.  If not, see http://www.gnu.org/licenses/
 
 #include <SDL.h>
 
-Version VersionInfo::ENGINE(1, 14, 110);
+Version VersionInfo::ENGINE(1, 14, 111);
 Version VersionInfo::MIN(0, 0, 0);
 Version VersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);