@quenty/genericscreenguiprovider 13.1.0 → 13.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [13.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/genericscreenguiprovider@13.1.0...@quenty/genericscreenguiprovider@13.2.0) (2024-03-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* Update avatar editor stuff ([16d10a8](https://github.com/Quenty/NevermoreEngine/commit/16d10a876c90d3b43d69b5f66e217e4c3749296b))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [13.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/genericscreenguiprovider@13.0.0...@quenty/genericscreenguiprovider@13.1.0) (2024-03-09)
|
|
7
18
|
|
|
8
19
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@quenty/genericscreenguiprovider",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0",
|
|
4
4
|
"description": "Providers screenGuis with a given display order for easy use",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Roblox",
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
"publishConfig": {
|
|
36
36
|
"access": "public"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "ab3631a54c4e8d448b4229c7e422a9c7f43c0dd7"
|
|
39
39
|
}
|
|
@@ -27,11 +27,11 @@ local require = require(script.Parent.loader).load(script)
|
|
|
27
27
|
|
|
28
28
|
local RunService = game:GetService("RunService")
|
|
29
29
|
|
|
30
|
-
local String = require("String")
|
|
31
30
|
local Blend = require("Blend")
|
|
32
31
|
local Maid = require("Maid")
|
|
33
32
|
local ScreenGuiService = require("ScreenGuiService")
|
|
34
33
|
local ServiceBag = require("ServiceBag")
|
|
34
|
+
local String = require("String")
|
|
35
35
|
|
|
36
36
|
local GenericScreenGuiProvider = {}
|
|
37
37
|
GenericScreenGuiProvider.ClassName = "GenericScreenGuiProvider"
|
|
@@ -129,7 +129,7 @@ function GenericScreenGuiProvider:Get(orderName)
|
|
|
129
129
|
frame.BorderSizePixel = 0
|
|
130
130
|
frame.BackgroundTransparency = 1
|
|
131
131
|
frame.BackgroundColor3 = Color3.new(1, 1, 1)
|
|
132
|
-
frame.Parent = self:_getScreenGuiService():
|
|
132
|
+
frame.Parent = self:_getScreenGuiService():GetGuiParent()
|
|
133
133
|
return frame
|
|
134
134
|
end
|
|
135
135
|
|
|
@@ -139,7 +139,7 @@ function GenericScreenGuiProvider:Get(orderName)
|
|
|
139
139
|
screenGui.AutoLocalize = false
|
|
140
140
|
screenGui.Archivable = false
|
|
141
141
|
screenGui.DisplayOrder = self:GetDisplayOrder(orderName)
|
|
142
|
-
screenGui.Parent = self:_getScreenGuiService():
|
|
142
|
+
screenGui.Parent = self:_getScreenGuiService():GetGuiParent()
|
|
143
143
|
screenGui.ZIndexBehavior = Enum.ZIndexBehavior.Sibling
|
|
144
144
|
|
|
145
145
|
return screenGui
|
|
@@ -33,10 +33,10 @@ end
|
|
|
33
33
|
|
|
34
34
|
return ScreenGui?
|
|
35
35
|
]=]
|
|
36
|
-
function ScreenGuiService:
|
|
36
|
+
function ScreenGuiService:GetGuiParent()
|
|
37
37
|
self:_ensureInit()
|
|
38
38
|
|
|
39
|
-
return self.
|
|
39
|
+
return self._guiParent.Value
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
--[=[
|
|
@@ -48,11 +48,11 @@ end
|
|
|
48
48
|
function ScreenGuiService:SetGuiParent(playerGui)
|
|
49
49
|
self:_ensureInit()
|
|
50
50
|
|
|
51
|
-
self.
|
|
51
|
+
self._guiParent.Value = playerGui
|
|
52
52
|
|
|
53
53
|
return function()
|
|
54
|
-
if self.
|
|
55
|
-
self.
|
|
54
|
+
if self._guiParent.Value == playerGui then
|
|
55
|
+
self._guiParent.Value = nil
|
|
56
56
|
end
|
|
57
57
|
end
|
|
58
58
|
end
|
|
@@ -65,7 +65,7 @@ end
|
|
|
65
65
|
function ScreenGuiService:ObservePlayerGui()
|
|
66
66
|
self:_ensureInit()
|
|
67
67
|
|
|
68
|
-
return self.
|
|
68
|
+
return self._guiParent:Observe()
|
|
69
69
|
end
|
|
70
70
|
|
|
71
71
|
function ScreenGuiService:_ensureInit()
|
|
@@ -73,14 +73,14 @@ function ScreenGuiService:_ensureInit()
|
|
|
73
73
|
|
|
74
74
|
if not self._maid then
|
|
75
75
|
self._maid = Maid.new()
|
|
76
|
-
self.
|
|
76
|
+
self._guiParent = self._maid:Add(ValueObject.new(PlayerGuiUtils.findPlayerGui()))
|
|
77
77
|
|
|
78
78
|
-- TODO: Don't do this? But what's the alternative..
|
|
79
79
|
if not RunService:IsRunning() then
|
|
80
80
|
if ScreenGuiService._hackPlayerGui then
|
|
81
|
-
self.
|
|
81
|
+
self._guiParent:Mount(ScreenGuiService._hackPlayerGui:Observe())
|
|
82
82
|
else
|
|
83
|
-
ScreenGuiService._hackPlayerGui = self.
|
|
83
|
+
ScreenGuiService._hackPlayerGui = self._guiParent
|
|
84
84
|
end
|
|
85
85
|
end
|
|
86
86
|
end
|