From d0449c7b657b385585898a00fb23c8bb8251834e Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Mon, 8 Jun 2020 05:35:03 -0500
Subject: [PATCH] Add support back for fixed x and y positioning of elements,
 fixed theming not using deep_merge

---
 lib/cyberarm_engine/ui/element.rb | 9 ++++++---
 lib/cyberarm_engine/ui/theme.rb   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/cyberarm_engine/ui/element.rb b/lib/cyberarm_engine/ui/element.rb
index 58a4b81..092416d 100644
--- a/lib/cyberarm_engine/ui/element.rb
+++ b/lib/cyberarm_engine/ui/element.rb
@@ -27,9 +27,6 @@ module CyberarmEngine
       @width  = 0
       @height = 0
 
-      @fixed_x = @x if @x != 0
-      @fixed_y = @y if @y != 0
-
       @style.width  = default(:width)  || nil
       @style.height = default(:height) || nil
 
@@ -42,6 +39,7 @@ module CyberarmEngine
     end
 
     def stylize
+      set_static_position
       set_border_thickness(@style.border_thickness)
 
       set_padding(@style.padding)
@@ -52,6 +50,11 @@ module CyberarmEngine
       set_border_color(@style.border_color)
     end
 
+    def set_static_position
+      @x = @style.x if @style.x != 0
+      @y = @style.y if @style.y != 0
+    end
+
     def set_background(background)
       @style.background = background
       @style.background_canvas.background = background
diff --git a/lib/cyberarm_engine/ui/theme.rb b/lib/cyberarm_engine/ui/theme.rb
index 2a26e65..0463d7b 100644
--- a/lib/cyberarm_engine/ui/theme.rb
+++ b/lib/cyberarm_engine/ui/theme.rb
@@ -12,7 +12,7 @@ module CyberarmEngine
     def theme_defaults(options)
       raise "Error" unless self.class.ancestors.include?(CyberarmEngine::Element)
       _theme = THEME
-      _theme = _theme.merge(options[:theme]) if options[:theme]
+      _theme = deep_merge(_theme, options[:theme]) if options[:theme]
       _theme.delete(:theme) if options[:theme]
 
       hash = {}