Skip to content

Commit 4cf7fed

Browse files
WeylonSantanaWeylonSantana
authored
update shop window title position (#62)
* update shop window title position * re-generate shop window json * re-generate shop window related files * Update ShopWindow.json
1 parent 506713c commit 4cf7fed

File tree

4 files changed

+155
-148
lines changed

4 files changed

+155
-148
lines changed

‎resources/gui/layouts/game/ShopContextMenu.json

+46-41
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Bounds": "0,0,147,10",
2+
"Bounds": "0,0,68,10",
33
"Dock": "None",
44
"Padding": "2,2,2,2",
55
"AlignmentEdgeDistances": "0,0,0,0",
@@ -8,8 +8,8 @@
88
"RenderColor": "255,255,255,255",
99
"Alignments": "",
1010
"DrawBackground": true,
11-
"MinimumSize": "1,1",
12-
"MaximumSize": "4096,4096",
11+
"MinimumSize": "0,0",
12+
"MaximumSize": "0,0",
1313
"Disabled": false,
1414
"Hidden": true,
1515
"RestrictToParent": false,
@@ -30,8 +30,8 @@
3030
"RenderColor": "255,255,255,255",
3131
"Alignments": "",
3232
"DrawBackground": true,
33-
"MinimumSize": "1,1",
34-
"MaximumSize": "4096,4096",
33+
"MinimumSize": "15,15",
34+
"MaximumSize": "0,0",
3535
"Disabled": true,
3636
"Hidden": true,
3737
"RestrictToParent": false,
@@ -44,15 +44,15 @@
4444
"UpOrLeftButton": {
4545
"Bounds": "0,0,15,15",
4646
"Dock": "None",
47-
"Padding": "0,0,0,0",
47+
"Padding": "3,3,3,3",
4848
"AlignmentEdgeDistances": "0,0,0,0",
4949
"AlignmentTransform": "0,0",
5050
"Margin": "0,0,0,0",
5151
"RenderColor": "255,255,255,255",
5252
"Alignments": "",
5353
"DrawBackground": true,
54-
"MinimumSize": "1,1",
55-
"MaximumSize": "4096,4096",
54+
"MinimumSize": "15,15",
55+
"MaximumSize": "15,15",
5656
"Disabled": false,
5757
"Hidden": false,
5858
"RestrictToParent": false,
@@ -61,10 +61,10 @@
6161
"ToolTipBackground": null,
6262
"ToolTipFont": null,
6363
"TooltipTextColor": null,
64-
"TextColor": "255,82,82,82",
64+
"TextColor": null,
6565
"HoveredTextColor": null,
6666
"ClickedTextColor": null,
67-
"DisabledTextColor": "255,90,90,90",
67+
"DisabledTextColor": null,
6868
"TextAlign": "Center",
6969
"AutoSizeToContents": false,
7070
"FontName": null,
@@ -91,8 +91,8 @@
9191
"RenderColor": "255,255,255,255",
9292
"Alignments": "",
9393
"DrawBackground": true,
94-
"MinimumSize": "1,1",
95-
"MaximumSize": "4096,4096",
94+
"MinimumSize": "0,0",
95+
"MaximumSize": "0,0",
9696
"Disabled": false,
9797
"Hidden": false,
9898
"RestrictToParent": true,
@@ -105,22 +105,24 @@
105105
"HoveredImage": null,
106106
"ClickedImage": null,
107107
"DisabledImage": null,
108-
"HoverSound": null,
109-
"MouseUpSound": null,
110-
"MouseDownSound": null
108+
"_stateSoundNames": {
109+
"Hover": "octave-tap-resonant.wav",
110+
"MouseDown": "octave-tap-warm.wav",
111+
"MouseUp": "octave-tap-warm.wav"
112+
}
111113
},
112114
"DownOrRightButton": {
113115
"Bounds": "0,0,15,15",
114116
"Dock": "None",
115-
"Padding": "0,0,0,0",
117+
"Padding": "3,3,3,3",
116118
"AlignmentEdgeDistances": "0,0,0,0",
117119
"AlignmentTransform": "0,0",
118120
"Margin": "0,0,0,0",
119121
"RenderColor": "255,255,255,255",
120122
"Alignments": "",
121123
"DrawBackground": true,
122-
"MinimumSize": "1,1",
123-
"MaximumSize": "4096,4096",
124+
"MinimumSize": "15,15",
125+
"MaximumSize": "15,15",
124126
"Disabled": false,
125127
"Hidden": false,
126128
"RestrictToParent": false,
@@ -129,10 +131,10 @@
129131
"ToolTipBackground": null,
130132
"ToolTipFont": null,
131133
"TooltipTextColor": null,
132-
"TextColor": "255,82,82,82",
134+
"TextColor": null,
133135
"HoveredTextColor": null,
134136
"ClickedTextColor": null,
135-
"DisabledTextColor": "255,90,90,90",
137+
"DisabledTextColor": null,
136138
"TextAlign": "Center",
137139
"AutoSizeToContents": false,
138140
"FontName": null,
@@ -160,8 +162,8 @@
160162
"RenderColor": "255,255,255,255",
161163
"Alignments": "",
162164
"DrawBackground": true,
163-
"MinimumSize": "1,1",
164-
"MaximumSize": "4096,4096",
165+
"MinimumSize": "15,15",
166+
"MaximumSize": "0,0",
165167
"Disabled": false,
166168
"Hidden": false,
167169
"RestrictToParent": false,
@@ -174,15 +176,15 @@
174176
"UpOrLeftButton": {
175177
"Bounds": "0,0,15,15",
176178
"Dock": "None",
177-
"Padding": "0,0,0,0",
179+
"Padding": "3,3,3,3",
178180
"AlignmentEdgeDistances": "0,0,0,0",
179181
"AlignmentTransform": "0,0",
180182
"Margin": "0,0,0,0",
181183
"RenderColor": "255,255,255,255",
182184
"Alignments": "",
183185
"DrawBackground": true,
184-
"MinimumSize": "1,1",
185-
"MaximumSize": "4096,4096",
186+
"MinimumSize": "15,15",
187+
"MaximumSize": "15,15",
186188
"Disabled": false,
187189
"Hidden": false,
188190
"RestrictToParent": false,
@@ -191,10 +193,10 @@
191193
"ToolTipBackground": null,
192194
"ToolTipFont": null,
193195
"TooltipTextColor": null,
194-
"TextColor": "255,82,82,82",
196+
"TextColor": null,
195197
"HoveredTextColor": null,
196198
"ClickedTextColor": null,
197-
"DisabledTextColor": "255,90,90,90",
199+
"DisabledTextColor": null,
198200
"TextAlign": "Center",
199201
"AutoSizeToContents": false,
200202
"FontName": null,
@@ -221,8 +223,8 @@
221223
"RenderColor": "255,255,255,255",
222224
"Alignments": "",
223225
"DrawBackground": true,
224-
"MinimumSize": "1,1",
225-
"MaximumSize": "4096,4096",
226+
"MinimumSize": "0,0",
227+
"MaximumSize": "0,0",
226228
"Disabled": false,
227229
"Hidden": false,
228230
"RestrictToParent": true,
@@ -235,22 +237,24 @@
235237
"HoveredImage": null,
236238
"ClickedImage": null,
237239
"DisabledImage": null,
238-
"HoverSound": null,
239-
"MouseUpSound": null,
240-
"MouseDownSound": null
240+
"_stateSoundNames": {
241+
"Hover": "octave-tap-resonant.wav",
242+
"MouseDown": "octave-tap-warm.wav",
243+
"MouseUp": "octave-tap-warm.wav"
244+
}
241245
},
242246
"DownOrRightButton": {
243247
"Bounds": "0,0,15,15",
244248
"Dock": "None",
245-
"Padding": "0,0,0,0",
249+
"Padding": "3,3,3,3",
246250
"AlignmentEdgeDistances": "0,0,0,0",
247251
"AlignmentTransform": "0,0",
248252
"Margin": "0,0,0,0",
249253
"RenderColor": "255,255,255,255",
250254
"Alignments": "",
251255
"DrawBackground": true,
252-
"MinimumSize": "1,1",
253-
"MaximumSize": "4096,4096",
256+
"MinimumSize": "15,15",
257+
"MaximumSize": "15,15",
254258
"Disabled": false,
255259
"Hidden": false,
256260
"RestrictToParent": false,
@@ -259,10 +263,10 @@
259263
"ToolTipBackground": null,
260264
"ToolTipFont": null,
261265
"TooltipTextColor": null,
262-
"TextColor": "255,82,82,82",
266+
"TextColor": null,
263267
"HoveredTextColor": null,
264268
"ClickedTextColor": null,
265-
"DisabledTextColor": "255,90,90,90",
269+
"DisabledTextColor": null,
266270
"TextAlign": "Center",
267271
"AutoSizeToContents": false,
268272
"FontName": null,
@@ -280,8 +284,9 @@
280284
"CenterImage": false
281285
}
282286
},
283-
"BackgroundTemplate": "contextmenu.png",
284-
"ItemTextColor": "255,180,180,180",
285-
"ItemHoveredTextColor": "255,255,255,255",
286-
"ItemFont": "sourcesansproblack,10"
287+
"BackgroundTemplate": null,
288+
"ItemTextColor": "",
289+
"ItemHoveredTextColor": "",
290+
"ItemFontName": "sourcesansproblack",
291+
"ItemFontSize": 10
287292
}

‎resources/gui/layouts/game/ShopItem.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Bounds": "0,0,34,35",
2+
"Bounds": "0,0,34,34",
33
"Dock": "None",
44
"Padding": "0,0,0,0",
55
"AlignmentEdgeDistances": "0,0,0,0",
@@ -8,8 +8,8 @@
88
"RenderColor": "255,255,255,255",
99
"Alignments": "",
1010
"DrawBackground": true,
11-
"MinimumSize": "1,1",
12-
"MaximumSize": "4096,4096",
11+
"MinimumSize": "34,34",
12+
"MaximumSize": "0,0",
1313
"Disabled": false,
1414
"Hidden": false,
1515
"RestrictToParent": false,
@@ -34,8 +34,8 @@
3434
"RenderColor": "255,255,255,255",
3535
"Alignments": "Center",
3636
"DrawBackground": true,
37-
"MinimumSize": "1,1",
38-
"MaximumSize": "4096,4096",
37+
"MinimumSize": "32,32",
38+
"MaximumSize": "0,0",
3939
"Disabled": false,
4040
"Hidden": false,
4141
"RestrictToParent": false,
@@ -44,7 +44,7 @@
4444
"ToolTipBackground": null,
4545
"ToolTipFont": null,
4646
"TooltipTextColor": null,
47-
"Texture": "",
47+
"Texture": null,
4848
"TextureNinePatchMargin": null,
4949
"HoverSound": "octave-tap-resonant.wav",
5050
"LeftMouseClickSound": null,

0 commit comments

Comments
 (0)