cyberarm/cyberarm_engine
1
0
Fork 0
mirror of https://github.com/cyberarm/cyberarm_engine.git synced 2025-12-16 13:12:34 +00:00
Code Issues Projects Releases Wiki Activity

Less broken

Browse Source
This commit is contained in:
Cyberarm
2019-03-04 16:10:22 -06:00
parent 9f857bd787
commit 85f35ee1f4
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/cyberarm_engine/ui/check_box.rb
View File

@@ -15,7 +15,6 @@ module CyberarmEngine
@width = @toggle_button.width + @label.width @width = @toggle_button.width + @label.width
@height = @toggle_button.height + @label.height @height = @toggle_button.height + @label.height
p @options
recalculate recalculate
end end

6
lib/cyberarm_engine/ui/theme.rb
View File

@@ -16,10 +16,10 @@ module CyberarmEngine
class_names = self.class.ancestors class_names = self.class.ancestors
class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! {|c| c.to_s.split("::").last.to_sym}.reverse! class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! {|c| c.to_s.split("::").last.to_sym}.reverse!
class_names.reverse.each do |klass| class_names.each do |klass|
next unless data = THEME.dig(klass) next unless data = THEME.dig(klass)
data.each do |key, value| data.each do |key, value|
hash[key] = value hash.merge!(data)
end end
end end
@@ -44,7 +44,7 @@ module CyberarmEngine
}, },
Button: { Button: {
margin: 0, margin: 2,
padding: 2, padding: 2,
border_thickness: 2, border_thickness: 2,
border_color: ["ffd59674".hex, "ffff8746".hex], border_color: ["ffd59674".hex, "ffff8746".hex],