Fixes for recent changes to cyberarm_engine

lib/pages/games.rb

@@ -95,8 +95,8 @@ class W3DHub
               # para game.name, width: 1.0, text_align: :center
             end
 
-            def game_button.hit_element?(x, y)
+            def game_button.hit_element?(x, y, elements = [])
-              self if hit?(x, y)
+              elements << self if hit?(x, y)
             end
 
             game_button.subscribe(:clicked_left_mouse_button) do
@@ -123,7 +123,6 @@ class W3DHub
           background_image_path = Cache.package_path(game.category, game.id, "background.png", "")
           if File.exist?(background_image_path)
             States::Interface.instance&.instance_variable_get(:"@interface_container")&.style&.background_image = get_image(background_image_path)
-            States::Interface.instance&.instance_variable_get(:"@interface_container")&.style&.default[:background_image] = get_image(background_image_path)
           end
 
           # Game Stuff
@@ -387,10 +386,8 @@ class W3DHub
                       caption game.name, margin_top: 8
                     end
 
-                    def container.hit_element?(x, y)
+                    def container.hit_element?(x, y, elements = [])
-                      return unless hit?(x, y)
+                      elements << self if hit?(x, y)
-
-                      self
                     end
 
                     container.subscribe(:clicked_left_mouse_button) do |element|

lib/pages/server_browser.rb

@@ -54,10 +54,8 @@ class W3DHub
 
                     if @filters[app_id]
                       img.style.color = 0xff_ffffff
-                      img.style.default[:color] = 0xff_ffffff
                     else
                       img.style.color = 0xff_444444
-                      img.style.default[:color] = 0xff_444444
                     end
 
                     populate_server_list
@@ -271,9 +269,8 @@ class W3DHub
       def stylize_selected_server(server_container)
         server_container.style.background = @selected_color
 
-        server_container.style.default[:background] = @selected_color
+        server_container.style.hover.background = @selected_color
-        server_container.style.hover[:background] = @selected_color
+        server_container.style.active.background = @selected_color
-        server_container.style.active[:background] = @selected_color
       end
 
       def reorder_server_list
@@ -284,11 +281,11 @@ class W3DHub
         end.reverse!.each_with_index do |child, i|
           next if @selected_server_container && child == @selected_server_container
 
-          child.style.hover[:background] = 0xaa_555566
+          child.style.hover.background = 0xaa_555566
-          child.style.hover[:active] = 0xaa_555588
+          child.style.active.background = 0xaa_555588
 
-          child.style.default[:background] = 0xaa_333333 if i.even?
+          child.style.background = 0xaa_333333 if i.even?
-          child.style.default[:background] = 0x00_000000 if i.odd?
+          child.style.background = 0x00_000000 if i.odd?
         end
 
         @server_list_container.recalculate
@@ -340,8 +337,8 @@ class W3DHub
           end
         end
 
-        def server_container.hit_element?(x, y)
+        def server_container.hit_element?(x, y, elements = [])
-          self if hit?(x, y)
+          elements << self if hit?(x, y)
         end
 
         server_container.subscribe(:clicked_left_mouse_button) do

lib/states/dialogs/prompt_dialog.rb

@@ -45,7 +45,6 @@ class W3DHub
               c = W3DHub::THEME[:Button][:border_color]
 
               @prompt_entry.style.border_color = c
-              @prompt_entry.style.default[:border_color] = c
               @prompt_entry.style.hover[:border_color]   = c
               @prompt_entry.style.active[:border_color]  = c
 
@@ -54,7 +53,6 @@ class W3DHub
               c = 0xff_ff0000
 
               @prompt_entry.style.border_color = c
-              @prompt_entry.style.default[:border_color] = c
               @prompt_entry.style.hover[:border_color]   = c
               @prompt_entry.style.active[:border_color]  = c
 

lib/states/interface.rb

@@ -60,25 +60,21 @@ class W3DHub
 
                 link I18n.t(:"interface.servers").upcase, text_size: 34, font: BOLD_FONT, margin_left: 12 do
                   @interface_container.style.background_image = DEFAULT_BACKGROUND_IMAGE
-                  @interface_container.style.default[:background_image] = DEFAULT_BACKGROUND_IMAGE
                   page(W3DHub::Pages::ServerBrowser)
                 end
 
                 link I18n.t(:"interface.community").upcase, text_size: 34, font: BOLD_FONT, margin_left: 12 do
                   @interface_container.style.background_image = DEFAULT_BACKGROUND_IMAGE
-                  @interface_container.style.default[:background_image] = DEFAULT_BACKGROUND_IMAGE
                   page(W3DHub::Pages::Community)
                 end
 
                 link I18n.t(:"interface.downloads").upcase, text_size: 34, font: BOLD_FONT, margin_left: 12 do
                   @interface_container.style.background_image = DEFAULT_BACKGROUND_IMAGE
-                  @interface_container.style.default[:background_image] = DEFAULT_BACKGROUND_IMAGE
                   page(W3DHub::Pages::DownloadManager)
                 end
 
                 link I18n.t(:"interface.settings").upcase, text_size: 34, font: BOLD_FONT, margin_left: 12 do
                   @interface_container.style.background_image = DEFAULT_BACKGROUND_IMAGE
-                  @interface_container.style.default[:background_image] = DEFAULT_BACKGROUND_IMAGE
                   page(W3DHub::Pages::Settings)
                 end
               end