From 1790ad6fafedd363bb8a716a28a2246aa06f1798 Mon Sep 17 00:00:00 2001
From: gymnast86 <stock.joann@gmail.com>
Date: Tue, 16 Jun 2026 05:30:08 -0400
Subject: [PATCH] fix merge conflicts

---
 src/d/d_file_select.cpp | 1 -
 src/dusk/ui/button.cpp  | 4 ++++
 src/dusk/ui/button.hpp  | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index 9db076a88e..6fa90818f5 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -30,7 +30,6 @@
 #include "dusk/ui/modal.hpp"
 #include "dusk/ui/rando_config.hpp"
 #include "dusk/ui/ui.hpp"
-#endif
 
 namespace {
 constexpr u8 pointer_target(u8 group, u8 index) noexcept {
diff --git a/src/dusk/ui/button.cpp b/src/dusk/ui/button.cpp
index 0d95db3791..31d32981b2 100644
--- a/src/dusk/ui/button.cpp
+++ b/src/dusk/ui/button.cpp
@@ -23,6 +23,10 @@ Button::Button(Rml::Element* parent, Props props, const Rml::String& tagName)
     update_props(std::move(props));
 }
 
+Rml::String Button::get_text() {
+    return mProps.text;
+}
+
 void Button::set_text(const Rml::String& text) {
     if (mProps.text != text) {
         mRoot->SetInnerRML(escape(text));
diff --git a/src/dusk/ui/button.hpp b/src/dusk/ui/button.hpp
index f2c9756c98..0a4fb2dfe6 100644
--- a/src/dusk/ui/button.hpp
+++ b/src/dusk/ui/button.hpp
@@ -16,6 +16,7 @@ public:
     Button(Rml::Element* parent, Rml::String text, const Rml::String& tagName = "button")
         : Button(parent, Props{std::move(text)}, tagName) {}
 
+    Rml::String get_text();
     void set_text(const Rml::String& text);
     Button& on_pressed(ButtonCallback callback);