From 057f3727deb83a768a45ad3b91282166683e039d Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Sun, 30 Jul 2023 00:11:16 +1000
Subject: [PATCH] Bottom Action Bar

---
 .../interface/actionbar/actionbarbottombg.png | Bin 0 -> 6162 bytes
 .../windowconfig/actionbarbottom.config       |   7 ++++++
 source/frontend/StarActionBar.cpp             |  23 ++++++++++++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 assets/opensb/interface/actionbar/actionbarbottombg.png
 create mode 100644 assets/opensb/interface/windowconfig/actionbarbottom.config

diff --git a/assets/opensb/interface/actionbar/actionbarbottombg.png b/assets/opensb/interface/actionbar/actionbarbottombg.png
new file mode 100644
index 0000000000000000000000000000000000000000..df7e9e2a1ab0531b9018217a759bd59aa3d233a5
GIT binary patch
literal 6162
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
OJ|`<Tb63VAi~k8J{ra>3

literal 0
HcmV?d00001

diff --git a/assets/opensb/interface/windowconfig/actionbarbottom.config b/assets/opensb/interface/windowconfig/actionbarbottom.config
new file mode 100644
index 0000000..f13a213
--- /dev/null
+++ b/assets/opensb/interface/windowconfig/actionbarbottom.config
@@ -0,0 +1,7 @@
+{ // gets merged over actionbar.config - game flips it all, this is just for the text and icons in the sprite
+  "paneLayout" : {
+    "background" : {
+      "fileBody" : "/interface/actionbar/actionbarbottombg.png"
+    }
+  }
+}
\ No newline at end of file
diff --git a/source/frontend/StarActionBar.cpp b/source/frontend/StarActionBar.cpp
index 82eb7d2..acaa3d1 100644
--- a/source/frontend/StarActionBar.cpp
+++ b/source/frontend/StarActionBar.cpp
@@ -12,6 +12,7 @@
 #include "StarPlayer.hpp"
 #include "StarPlayerInventory.hpp"
 #include "StarAssets.hpp"
+#include "StarImageMetadataDatabase.hpp"
 #include "StarItem.hpp"
 #include "StarMerchantInterface.hpp"
 
@@ -50,7 +51,29 @@ ActionBar::ActionBar(MainInterfacePaneManager* paneManager, PlayerPtr player) {
       swapCustomBar();
     });
 
+  auto configuration = Root::singleton().configuration();
+  bool bottomBar = configuration->getPath("inventory.bottomActionBar").optBool().value(false);
+  if (bottomBar)
+    m_config = jsonMerge(m_config, assets->json("/interface/windowconfig/actionbarbottom.config"));
+
   reader.construct(m_config.get("paneLayout"), this);
+  if (bottomBar) {
+    setAnchor(PaneAnchor::CenterBottom);
+    m_anchorOffset[1] *= -1;
+
+    if (!m_bgBody.empty())
+      m_bgBody += "?flipy";
+    if (!m_bgHeader.empty())
+      m_bgHeader += "?flipy";
+    if (!m_bgFooter.empty())
+      m_bgFooter += "?flipy";
+    swap(m_bgHeader, m_bgFooter);
+
+    for (auto& child : m_members) {
+      auto position = child->relativePosition();
+      child->setPosition({position[0], m_bodySize[1] - position[1] - child->size()[1] + 1});
+    }
+  }
 
   for (uint8_t i = 0; i < m_player->inventory()->customBarIndexes(); ++i) {
     auto customBarLeft = fetchChild<ItemSlotWidget>(strf("customBar{}L", i + 1));