From 52940d1cfedafb18dc703bae0d114f2c0d15d74f Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Thu, 19 Dec 2019 11:17:31 -0600 Subject: [PATCH] Fixed element borders not always lining up when using dynamic width/height --- lib/cyberarm_engine/ui/element.rb | 2 +- lib/cyberarm_engine/ui/theme.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cyberarm_engine/ui/element.rb b/lib/cyberarm_engine/ui/element.rb index 307f390..a7b9afb 100644 --- a/lib/cyberarm_engine/ui/element.rb +++ b/lib/cyberarm_engine/ui/element.rb @@ -212,7 +212,7 @@ module CyberarmEngine raise "dimension must be either :width or :height" unless dimension == :width || dimension == :height if size && size.is_a?(Numeric) if size.between?(0.0, 1.0) - (@parent.send(:"content_#{dimension}") - self.send(:"noncontent_#{dimension}") - 1) * size + ((@parent.send(:"content_#{dimension}") - self.send(:"noncontent_#{dimension}") - 1) * size).round else size end diff --git a/lib/cyberarm_engine/ui/theme.rb b/lib/cyberarm_engine/ui/theme.rb index 76728df..1a3ad73 100644 --- a/lib/cyberarm_engine/ui/theme.rb +++ b/lib/cyberarm_engine/ui/theme.rb @@ -112,7 +112,7 @@ module CyberarmEngine height: 36, background: 0xff111111, fraction_background: [0xffc75e61, 0xffe26623], - border_thickness: 4, + border_thickness: 1, border_color: [0xffd59674, 0xffff8746] } }.freeze