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

More changes to how styles are applied, fixed bug where a Container would re-evaluate its build block when clicked, fixed background method in DSL having no effect, fixed edit line losing 'focus' when mouse moved out, misc. other changes and fixes.

Browse Source
This commit is contained in:
cyberarm
2021-03-27 20:10:46 -05:00
committed by Cyberarm
parent a70c106387
commit 4b417f9ab7
5 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cyberarm_engine/ui/dsl.rb
View File

@@ -98,7 +98,7 @@ module CyberarmEngine
end end
def background(color = Gosu::Color::NONE) def background(color = Gosu::Color::NONE)
element_parent.style.background = color element_parent.style.default[:background] = color
end end
def theme(theme) def theme(theme)

151
lib/cyberarm_engine/ui/element.rb
View File

@@ -38,6 +38,8 @@ module CyberarmEngine
@style.background_canvas = Background.new @style.background_canvas = Background.new
@style.border_canvas = BorderCanvas.new(element: self) @style.border_canvas = BorderCanvas.new(element: self)
@style_event = :default
stylize stylize
default_events default_events
@@ -47,14 +49,18 @@ module CyberarmEngine
def stylize def stylize
set_static_position set_static_position
set_border_thickness(@style.border_thickness)
set_padding(@style.padding) set_padding
set_margin
set_margin(@style.margin) set_background
set_background(@style.background) set_border_thickness
set_border_color(@style.border_color) set_border_color
end
def safe_style_fetch(*args)
@style.hash.dig(@style_event, *args) || @style.hash.dig(:default, *args) || default(*args)
end end
def set_static_position def set_static_position
@@ -62,86 +68,28 @@ module CyberarmEngine
@y = @style.y if @style.y != 0 @y = @style.y if @style.y != 0
end end
def set_background(background) def set_background
@style.background = background @style.background = safe_style_fetch(:background)
@style.background_canvas.background = background
@style.background_canvas.background = @style.background
end end
def set_border_thickness(border_thickness) def set_border_thickness
@style.border_thickness = border_thickness @style.border_thickness = safe_style_fetch(:border_thickness)
@style.border_thickness_left = default(:border_thickness_left) || @style.border_thickness @style.border_thickness_left = safe_style_fetch(:border_thickness_left) || @style.border_thickness
@style.border_thickness_right = default(:border_thickness_right) || @style.border_thickness @style.border_thickness_right = safe_style_fetch(:border_thickness_right) || @style.border_thickness
@style.border_thickness_top = default(:border_thickness_top) || @style.border_thickness @style.border_thickness_top = safe_style_fetch(:border_thickness_top) || @style.border_thickness
@style.border_thickness_bottom = default(:border_thickness_bottom) || @style.border_thickness @style.border_thickness_bottom = safe_style_fetch(:border_thickness_bottom) || @style.border_thickness
end end
def set_border_color(color) def set_border_color
@style.border_color = color @style.border_color = safe_style_fetch(:border_color)
@style.border_color_left = default(:border_color_left) || @style.border_color @style.border_color_left = safe_style_fetch(:border_color_left) || @style.border_color
@style.border_color_right = default(:border_color_right) || @style.border_color @style.border_color_right = safe_style_fetch(:border_color_right) || @style.border_color
@style.border_color_top = default(:border_color_top) || @style.border_color @style.border_color_top = safe_style_fetch(:border_color_top) || @style.border_color
@style.border_color_bottom = default(:border_color_bottom) || @style.border_color @style.border_color_bottom = safe_style_fetch(:border_color_bottom) || @style.border_color
@style.border_canvas.color = color
end
def set_padding(padding)
@style.padding = padding
@style.padding_left = default(:padding_left) || @style.padding
@style.padding_right = default(:padding_right) || @style.padding
@style.padding_top = default(:padding_top) || @style.padding
@style.padding_bottom = default(:padding_bottom) || @style.padding
end
def set_margin(margin)
@style.margin = margin
@style.margin_left = default(:margin_left) || @style.margin
@style.margin_right = default(:margin_right) || @style.margin
@style.margin_top = default(:margin_top) || @style.margin
@style.margin_bottom = default(:margin_bottom) || @style.margin
end
def update_styles(event = :default)
_style = @style.send(event)
if @text&.is_a?(CyberarmEngine::Text)
@text.color = _style&.dig(:color) || @style.color
@text.swap_font(_style&.dig(:text_size) || @style.text_size, _style&.dig(:font) || @style.font)
end
_padding = (_style&.dig(:padding) || @style.padding) || 0
@style.padding_left = _style&.dig(:padding_left) || _padding
@style.padding_right = _style&.dig(:padding_right) || _padding
@style.padding_top = _style&.dig(:padding_top) || _padding
@style.padding_bottom = _style&.dig(:padding_bottom) || _padding
_margin = (_style&.dig(:margin) || @style.margin) || 0
@style.margin_left = _style&.dig(:margin_left) || _margin
@style.margin_right = _style&.dig(:margin_right) || _margin
@style.margin_top = _style&.dig(:margin_top) || _margin
@style.margin_bottom = _style&.dig(:margin_bottom) || _margin
@style.background_canvas.background = _style&.dig(:background) || @style.background
_border_thickness = (_style&.dig(:border_thickness) || @style.border_thickness) || 0
@style.border_thickness_left = _style&.dig(:border_thickness_left) || _border_thickness
@style.border_thickness_right = _style&.dig(:border_thickness_right) || _border_thickness
@style.border_thickness_top = _style&.dig(:border_thickness_top) || _border_thickness
@style.border_thickness_bottom = _style&.dig(:border_thickness_bottom) || _border_thickness
_border_color = (_style&.dig(:border_color) || @style.border_color) || Gosu::Color::NONE
@style.border_color_left = _style&.dig(:border_color_left) || _border_color
@style.border_color_right = _style&.dig(:border_color_right) || _border_color
@style.border_color_top = _style&.dig(:border_color_top) || _border_color
@style.border_color_bottom = _style&.dig(:border_color_bottom) || _border_color
@style.border_canvas.color = [ @style.border_canvas.color = [
@style.border_color_top, @style.border_color_top,
@@ -149,9 +97,36 @@ module CyberarmEngine
@style.border_color_bottom, @style.border_color_bottom,
@style.border_color_left @style.border_color_left
] ]
end
def set_padding
@style.padding = safe_style_fetch(:padding)
@style.padding_left = safe_style_fetch(:padding_left) || @style.padding
@style.padding_right = safe_style_fetch(:padding_right) || @style.padding
@style.padding_top = safe_style_fetch(:padding_top) || @style.padding
@style.padding_bottom = safe_style_fetch(:padding_bottom) || @style.padding
end
def set_margin
@style.margin = safe_style_fetch(:margin)
@style.margin_left = safe_style_fetch(:margin_left) || @style.margin
@style.margin_right = safe_style_fetch(:margin_right) || @style.margin
@style.margin_top = safe_style_fetch(:margin_top) || @style.margin
@style.margin_bottom = safe_style_fetch(:margin_bottom) || @style.margin
end
def update_styles(event = :default)
_style = @style.send(event)
@style_event = event
if @text.is_a?(CyberarmEngine::Text)
@text.color = _style&.dig(:color) || @style.default[:color]
@text.swap_font(_style&.dig(:text_size) || @style.default[:text_size], _style&.dig(:font) || @style.default[:font])
end
(root&.gui_state || @gui_state).request_recalculate (root&.gui_state || @gui_state).request_recalculate
# recalculate
end end
def default_events def default_events
@@ -210,16 +185,16 @@ module CyberarmEngine
end end
def clicked_left_mouse_button(_sender, _x, _y) def clicked_left_mouse_button(_sender, _x, _y)
@block&.call(self) if @enabled @block&.call(self) if @enabled && !self.is_a?(Container)
return :handled :handled
end end
def leave(_sender) def leave(_sender)
unless @enabled if @enabled
update_styles(:disabled)
else
update_styles update_styles
else
update_styles(:disabled)
end end
:handled :handled
@@ -228,6 +203,12 @@ module CyberarmEngine
def blur(_sender) def blur(_sender)
@focus = false @focus = false
if @enabled
update_styles
else
update_styles(:disabled)
end
:handled :handled
end end

39
lib/cyberarm_engine/ui/elements/edit_line.rb
View File

@@ -59,6 +59,8 @@ module CyberarmEngine
end end
def update def update
@style_event = :active if @focus
@text.text = if @type == :password @text.text = if @type == :password
default(:password_character) * @text_input.text.length default(:password_character) * @text_input.text.length
else else
@@ -194,38 +196,27 @@ module CyberarmEngine
:handled :handled
end end
def enter(_sender)
if @focus
@style.background_canvas.background = default(:active, :background)
@text.color = default(:active, :color)
else
@style.background_canvas.background = default(:hover, :background)
@text.color = default(:hover, :color)
end
:handled
end
def leave(sender)
super unless @focus
:handled
end
def focus(sender) def focus(sender)
@focus = true super
@style.background_canvas.background = default(:active, :background)
@text.color = default(:active, :color)
window.text_input = @text_input window.text_input = @text_input
@text_input.caret_pos = @text_input.selection_start = @text_input.text.length @text_input.caret_pos = @text_input.selection_start = @text_input.text.length
:handled :handled
end end
def enter(sender)
_has_focus = @focus
super
@focus = _has_focus
:handled
end
def blur(_sender) def blur(_sender)
@focus = false super
@style.background_canvas.background = default(:background)
@text.color = default(:color)
window.text_input = nil window.text_input = nil
:handled :handled

17
lib/cyberarm_engine/ui/style.rb
View File

@@ -17,8 +17,20 @@ end
module CyberarmEngine module CyberarmEngine
class Style class Style
attr_reader :hash
def initialize(hash = {}) def initialize(hash = {})
@hash = Marshal.load(Marshal.dump(hash)) h = Marshal.load(Marshal.dump(hash))
h[:default] = {}
h.each do |key, value|
next if value.is_a?(Hash)
h[:default][key] = value
end
@hash = h
end end
def method_missing(method, *args) def method_missing(method, *args)
@@ -27,9 +39,8 @@ module CyberarmEngine
@hash[method.to_s.sub("=", "").to_sym] = args.first @hash[method.to_s.sub("=", "").to_sym] = args.first
elsif args.size == 0 elsif args.empty?
@hash[method] @hash[method]
else else
raise ArgumentError, "Did not expect arguments" raise ArgumentError, "Did not expect arguments"
end end

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

@@ -177,6 +177,10 @@ module CyberarmEngine
checkmark: "√" checkmark: "√"
}, },
CheckBox: { # < Flow
text_wrap: :none
},
Progress: { # < Element Progress: { # < Element
width: 250, width: 250,
height: 36, height: 36,