From 32bbddb70698b6620c0a94cad516db6ce063326d Mon Sep 17 00:00:00 2001 From: Insality Date: Thu, 30 Jan 2020 02:00:01 +0300 Subject: [PATCH] Little code refactor --- druid/helper/formats.lua | 3 ++- druid/system/component.lua | 4 ++-- druid/system/druid_instance.lua | 7 +++++++ druid/system/settings.lua | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/druid/helper/formats.lua b/druid/helper/formats.lua index 9c38861..d08dccf 100644 --- a/druid/helper/formats.lua +++ b/druid/helper/formats.lua @@ -5,6 +5,7 @@ local const = require("druid.const") local M = {} + --- Return number with zero number prefix -- @function formats.add_prefix_zeros -- @tparam number num Number for conversion @@ -13,7 +14,7 @@ local M = {} function M.add_prefix_zeros(num, count) local result = tostring(num) for i = string.len(result), count - 1 do - result = const.ZERO..result + result = const.ZERO .. result end return result end diff --git a/druid/system/component.lua b/druid/system/component.lua index a1ea21e..b2d8d83 100644 --- a/druid/system/component.lua +++ b/druid/system/component.lua @@ -16,8 +16,8 @@ function instance.get_style(self) end -function instance.set_style(self, component_style) - self._meta.style = component_style +function instance.set_style(self, druid_style) + self._meta.style = druid_style end diff --git a/druid/system/druid_instance.lua b/druid/system/druid_instance.lua index 500e484..86cb821 100644 --- a/druid/system/druid_instance.lua +++ b/druid/system/druid_instance.lua @@ -1,10 +1,16 @@ local const = require("druid.const") local druid_input = require("druid.helper.druid_input") +local settings = require("druid.system.settings") local M = {} local function input_init(self) + -- TODO: To custom settings + if not settings.auto_focus_gain then + return + end + if not self.input_inited then self.input_inited = true druid_input.focus() @@ -16,6 +22,7 @@ end local function create(self, module) ---@class component local instance = setmetatable({}, { __index = module }) + -- Component context, self from component creation instance:setup_component(self._context, self._style) diff --git a/druid/system/settings.lua b/druid/system/settings.lua index 2fd8bbb..637339d 100644 --- a/druid/system/settings.lua +++ b/druid/system/settings.lua @@ -5,6 +5,7 @@ local M = {} M.is_debug = false M.default_style = nil +M.auto_focus_gain = true function M.get_text(name)