This commit is contained in:
Nikita Kruglickiy
2020-12-27 21:29:46 +06:00
parent 1a0785862d
commit eaf0a90173
13 changed files with 116 additions and 86 deletions

View File

@@ -1,9 +1,9 @@
--@include label.txt
--@include radius_mixin.txt
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("label.txt")
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
EButton = class("EButton", ELabel)
EButton:include(require("radius_mixin.txt"))

View File

@@ -1,10 +1,10 @@
--@include element.txt
--@include label.txt
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("element.txt")
require("label.txt")
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
ECheckbox = class("ECheckbox", ELabel)

View File

@@ -1,8 +1,6 @@
--@include ../utils.txt
--@include ../skins/default.txt
--@include /koptilnya/libs/utils.txt
require("../utils.txt")
local defaultSkin = require("../skins/default.txt")
require("/koptilnya/libs/utils.txt")
Element = class("Element")
@@ -20,7 +18,6 @@ function Element:initialize()
self._firstChild = nil
self._prevSibling = nil
self._nextSibling = nil
self._skin = defaultSkin
end
function Element:setWidth(width)
@@ -128,7 +125,6 @@ function Element:addChild(child)
checkVarClass(child, Element)
child:setParent(self)
child:_setSkin(self._skin)
if not self._firstChild then
self._firstChild = child
@@ -187,10 +183,6 @@ end
-- PROTECTED
function Element:_setSkin(skin)
self._skin = skin
end
function Element:_postEvent(eventKey, ...)
if eventKey == "THINK" then
return self:_onThink()

View File

@@ -1,7 +1,5 @@
--@include element.txt
--@include ../utils.txt
require("element.txt")
require("../utils.txt")
EEmpty = class("EEmpty", Element)

View File

@@ -1,8 +1,8 @@
--@include element.txt
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("element.txt")
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
ELabel = class("ELabel", Element)

View File

@@ -1,12 +1,12 @@
--@include element.txt
--@include label.txt
--@include button.txt
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("element.txt")
require("label.txt")
require("button.txt")
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
EPanel = class("EPanel", Element)

View File

@@ -1,6 +1,6 @@
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
local MIXIN = {}

View File

@@ -1,8 +1,8 @@
--@include element.txt
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("element.txt")
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
EShape = class("EShape", Element)

View File

@@ -1,22 +1,17 @@
--@include utils.txt
--@include render_devices/render_device.txt
--@include elements/root.txt
--@include skins/default.txt
require("utils.txt")
require("render_devices/render_device.txt")
require("elements/root.txt")
local defaultSkin = require("skins/default.txt")
GUI = class("GUI")
function GUI:initialize(renderDevice, skin)
function GUI:initialize(renderDevice)
checkVarClass(renderDevice, RenderDevice)
self.renderDevice = renderDevice
self._root = ERoot:new("root")
self._root:setSize(renderDevice:getSize())
self._root:_setSkin(skin or defaultSkin)
hook.add("inputPressed", "gui_inputPressed", function(key)
local keyName = input.getKeyName(key)
@@ -69,7 +64,7 @@ function GUI:getRoot()
end
function GUI:add(element)
this._root:addChild(element)
self._root:addChild(element)
end
function GUI:setVisible(state)

View File

@@ -1,6 +1,6 @@
--@include ../utils.txt
--@include /koptilnya/libs/utils.txt
require("../utils.txt")
require("/koptilnya/libs/utils.txt")
RenderDevice = class("RenderDevice")