mirror of https://github.com/teverse/teverse
Compare commits
No commits in common. "4f369cd4b779be78e4b93af8e8625c1448f50329" and "ea94bd141579193d0bc3aed9475aba34060b0ecf" have entirely different histories.
4f369cd4b7
...
ea94bd1415
|
@ -30,17 +30,14 @@ local function createApp(app)
|
||||||
active = false
|
active = false
|
||||||
})
|
})
|
||||||
|
|
||||||
local img = teverse.construct("guiImage", {
|
|
||||||
size = guiCoord(1, 0, 1, 0),
|
|
||||||
parent = appGui,
|
|
||||||
active = false,
|
|
||||||
zIndex = -1
|
|
||||||
})
|
|
||||||
|
|
||||||
if (app.iconUrl and app.iconUrl ~= "") then
|
if (app.iconUrl and app.iconUrl ~= "") then
|
||||||
img.image = app.iconUrl
|
local img = teverse.construct("guiImage", {
|
||||||
else
|
size = guiCoord(1, 0, 1, 0),
|
||||||
img.image = "tevurl:img/tevapp.png"
|
image = app.iconUrl,
|
||||||
|
parent = appGui,
|
||||||
|
active = false,
|
||||||
|
zIndex = -1
|
||||||
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
return appGui
|
return appGui
|
||||||
|
@ -133,7 +130,7 @@ return {
|
||||||
appGui.parent = appsContainer
|
appGui.parent = appsContainer
|
||||||
appGui:on("mouseLeftUp", function()
|
appGui:on("mouseLeftUp", function()
|
||||||
if not loading.visible then
|
if not loading.visible then
|
||||||
loading.text = "Loading App " .. (app.packageNetworked and "Online" or "Offline")
|
loading.text = "Loading App"
|
||||||
loading.visible = true
|
loading.visible = true
|
||||||
if not app.packageNetworked then
|
if not app.packageNetworked then
|
||||||
teverse.apps:loadRemote(app.id)
|
teverse.apps:loadRemote(app.id)
|
||||||
|
|
|
@ -19,17 +19,14 @@ local function createApp(app)
|
||||||
active = false
|
active = false
|
||||||
})
|
})
|
||||||
|
|
||||||
local img = teverse.construct("guiImage", {
|
|
||||||
size = guiCoord(1, 0, 1, 0),
|
|
||||||
parent = appGui,
|
|
||||||
active = false,
|
|
||||||
zIndex = -1
|
|
||||||
})
|
|
||||||
|
|
||||||
if (app.iconUrl and app.iconUrl ~= "") then
|
if (app.iconUrl and app.iconUrl ~= "") then
|
||||||
img.image = app.iconUrl
|
local img = teverse.construct("guiImage", {
|
||||||
else
|
size = guiCoord(1, 0, 1, 0),
|
||||||
img.image = "tevurl:img/tevapp.png"
|
image = app.iconUrl,
|
||||||
|
parent = appGui,
|
||||||
|
active = false,
|
||||||
|
zIndex = -1
|
||||||
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
return appGui
|
return appGui
|
||||||
|
@ -40,19 +37,6 @@ return {
|
||||||
iconId = "layer-group",
|
iconId = "layer-group",
|
||||||
iconType = "faSolid",
|
iconType = "faSolid",
|
||||||
setup = function(page)
|
setup = function(page)
|
||||||
local loading = teverse.construct("guiTextBox", {
|
|
||||||
parent = page,
|
|
||||||
size = guiCoord(1.0, 100, 1.0, 100),
|
|
||||||
position = guiCoord(0, -50, 0, -50),
|
|
||||||
backgroundAlpha = 0.4,
|
|
||||||
backgroundColour = colour(0, 0, 0),
|
|
||||||
text = "Working...",
|
|
||||||
textColour = colour(0,0,0),
|
|
||||||
textAlign = "middle",
|
|
||||||
visible = false,
|
|
||||||
zIndex = 10000
|
|
||||||
})
|
|
||||||
|
|
||||||
teverse.construct("guiTextBox", {
|
teverse.construct("guiTextBox", {
|
||||||
parent = page,
|
parent = page,
|
||||||
size = guiCoord(1.0, -20, 0, 48),
|
size = guiCoord(1.0, -20, 0, 48),
|
||||||
|
@ -164,7 +148,7 @@ return {
|
||||||
appGui.parent = appsContainer
|
appGui.parent = appsContainer
|
||||||
appGui:on("mouseLeftUp", function()
|
appGui:on("mouseLeftUp", function()
|
||||||
if not loading.visible then
|
if not loading.visible then
|
||||||
loading.text = "Loading App " .. (app.packageNetworked and "Online" or "Offline")
|
loading.text = "Loading App"
|
||||||
loading.visible = true
|
loading.visible = true
|
||||||
if not app.packageNetworked then
|
if not app.packageNetworked then
|
||||||
teverse.apps:loadRemote(app.id)
|
teverse.apps:loadRemote(app.id)
|
||||||
|
|
Loading…
Reference in New Issue