lib/cyberarm_engine/ui/dsl.rb in cyberarm_engine-0.20.0 vs lib/cyberarm_engine/ui/dsl.rb in cyberarm_engine-0.21.0

@@ -114,25 +114,25 @@
 
       element
     end
 
     private def element_parent
-      $__current_container__
+      CyberarmEngine::Element::Container.current_container
     end
 
     private def container(klass, options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
       _container = klass.new(options, block)
 
       old_parent = element_parent
-      $__current_container__ = _container
+      CyberarmEngine::Element::Container.current_container = _container
 
       _container.build
       _container.parent.add(_container)
 
-      $__current_container__ = old_parent
+      CyberarmEngine::Element::Container.current_container = old_parent
 
       _container
     end
   end
 end