root
/
teverse
mirror of https://github.com/teverse/teverse
1
0
Fork 0
Code Releases Activity

Compare commits

base: root:c6a68071d2563b2d4a15038f985a144c3e035a86
Branches Tags
root:master
root:rewrite-tevx
root:repro/memory-crash
root:bug/crash-repro
root:dev-0.20.6
root:feature-round-theme-property
root:feature-publish-interface
root:dev
root:backup
...
compare: root:5393b77131a783e4988614ad47163f06054805c9
Branches Tags
root:master
root:rewrite-tevx
root:repro/memory-crash
root:bug/crash-repro
root:dev-0.20.6
root:feature-round-theme-property
root:feature-publish-interface
root:dev
root:backup

6 Commits
c6a68071d2 ... 5393b77131

Author SHA1 Message Date
Sanjay 5393b77131
Merge pull request #67 from UndecidedSource/master 
Keep borders square for simplicity
 2020-03-24 14:45:20 -04:00
UndecidedFactor 5ab00b1a43
Update window.lua 2020-03-22 14:01:04 -04:00
UndecidedFactor 7e1895fd6a
Update window.lua 2020-03-22 13:59:16 -04:00
UndecidedFactor cdaa993ade
Update window.lua 2020-03-22 13:54:14 -04:00
UndecidedFactor adebd303a6
Merge pull request #1 from UndecidedSource/patch-1 
Update ui.lua
 2020-03-22 13:33:35 -04:00
UndecidedFactor b341d889f6
Update ui.lua 2020-03-22 13:30:08 -04:00
2 changed files with 7 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
workshop/controllers/ui/components/propertyEditor/window.lua
View File

@ -79,6 +79,8 @@ function controller.generateProperties()
size = guiCoord(0.55, -15, 1, 0), size = guiCoord(0.55, -15, 1, 0),
position = guiCoord(0, 0, 0, 0), position = guiCoord(0, 0, 0, 0),
fontSize = 18, fontSize = 18,
backgroundAlpha = 1,
borderAlpha = 0,
text = v.property, text = v.property,
align = enums.align.topRight align = enums.align.topRight
}, "backgroundText") }, "backgroundText")

10
workshop/controllers/ui/core/ui.lua
View File

@ -29,8 +29,8 @@ return {
text = text, text = text,
fontSize = 16, fontSize = 16,
align = enums.align.middle, align = enums.align.middle,
borderRadius = 3, borderRadius = 0,
borderAlpha = 0.25, borderAlpha = 1,
zIndex = 5000, zIndex = 5000,
handleEvents = false, handleEvents = false,
visible = false visible = false
@ -58,7 +58,7 @@ return {
local btn = create("guiFrame", parent, { local btn = create("guiFrame", parent, {
size = size, size = size,
position = position, position = position,
borderRadius = 3, borderRadius = 0,
hoverCursor = "fa:s-hand-pointer" hoverCursor = "fa:s-hand-pointer"
}, theme) }, theme)
@ -97,7 +97,7 @@ return {
name = "titleBar", name = "titleBar",
position = guiCoord(0, -1, 0, -4), position = guiCoord(0, -1, 0, -4),
size = guiCoord(1, 2, 0, 25), size = guiCoord(1, 2, 0, 25),
borderRadius = 4, borderRadius = 0,
hoverCursor = "fa:s-hand-pointer" hoverCursor = "fa:s-hand-pointer"
}, themer.types.primary) }, themer.types.primary)
@ -181,7 +181,7 @@ return {
size = guiCoord(0.4, 0, 0.4, 0), size = guiCoord(0.4, 0, 0.4, 0),
position = guiCoord(0.3, 0, 0.3, 0), position = guiCoord(0.3, 0, 0.3, 0),
cropChildren = false, cropChildren = false,
borderRadius = 5, borderRadius = 0,
handleEvents = false handleEvents = false
}, themer.types.primary) }, themer.types.primary)