Skip to content

Commit f0f90ce

Browse files
committed
Update property panels layers
1 parent 3e0d898 commit f0f90ce

File tree

9 files changed

+105
-5
lines changed

9 files changed

+105
-5
lines changed

druid/helper.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ end
366366
---Check if device is desktop
367367
---@return boolean
368368
function M.is_desktop()
369-
return const.CURRENT_SYSTEM_NAME == const.OS.WINDOWS or const.CURRENT_SYSTEM_NAME == const.OS.MAC or const.CURRENT_SYSTEM_NAME == const.OS.LINUX
369+
local name = const.CURRENT_SYSTEM_NAME
370+
return name == const.OS.WINDOWS or name == const.OS.MAC or name == const.OS.LINUX
370371
end
371372

372373

druid/widget/properties_panel/properties/property_button.gui

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ nodes {
1515
texture: "druid/empty"
1616
id: "root"
1717
adjust_mode: ADJUST_MODE_STRETCH
18+
layer: "druid"
1819
inherit_alpha: true
1920
visible: false
2021
}
@@ -52,6 +53,7 @@ nodes {
5253
}
5354
adjust_mode: ADJUST_MODE_STRETCH
5455
parent: "root"
56+
layer: "druid_text_bold"
5557
inherit_alpha: true
5658
outline_alpha: 0.0
5759
shadow_alpha: 0.0
@@ -89,6 +91,7 @@ nodes {
8991
texture: "druid/rect_round2_width2"
9092
id: "button"
9193
parent: "E_Anchor"
94+
layer: "druid"
9295
inherit_alpha: true
9396
slice9 {
9497
x: 5.0
@@ -116,6 +119,7 @@ nodes {
116119
pivot: PIVOT_S
117120
adjust_mode: ADJUST_MODE_STRETCH
118121
parent: "button"
122+
layer: "druid"
119123
inherit_alpha: true
120124
}
121125
nodes {
@@ -147,9 +151,16 @@ nodes {
147151
z: 1.0
148152
}
149153
parent: "button"
154+
layer: "druid_text_bold"
150155
inherit_alpha: true
151156
outline_alpha: 0.0
152157
shadow_alpha: 0.0
153158
}
159+
layers {
160+
name: "druid"
161+
}
162+
layers {
163+
name: "druid_text_bold"
164+
}
154165
material: "/builtins/materials/gui.material"
155166
adjust_reference: ADJUST_REFERENCE_PARENT

druid/widget/properties_panel/properties/property_checkbox.gui

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ nodes {
1515
texture: "druid/empty"
1616
id: "root"
1717
adjust_mode: ADJUST_MODE_STRETCH
18+
layer: "druid"
1819
inherit_alpha: true
1920
visible: false
2021
}
@@ -51,6 +52,7 @@ nodes {
5152
z: 1.0
5253
}
5354
parent: "root"
55+
layer: "druid_text_bold"
5456
inherit_alpha: true
5557
outline_alpha: 0.0
5658
shadow_alpha: 0.0
@@ -88,6 +90,7 @@ nodes {
8890
texture: "druid/rect_round2_width2"
8991
id: "button"
9092
parent: "E_Anchor"
93+
layer: "druid"
9194
inherit_alpha: true
9295
slice9 {
9396
x: 5.0
@@ -106,6 +109,7 @@ nodes {
106109
texture: "druid/ui_circle_16"
107110
id: "icon"
108111
parent: "button"
112+
layer: "druid"
109113
inherit_alpha: true
110114
size_mode: SIZE_MODE_AUTO
111115
}
@@ -128,7 +132,14 @@ nodes {
128132
pivot: PIVOT_S
129133
adjust_mode: ADJUST_MODE_STRETCH
130134
parent: "button"
135+
layer: "druid"
131136
inherit_alpha: true
132137
}
138+
layers {
139+
name: "druid"
140+
}
141+
layers {
142+
name: "druid_text_bold"
143+
}
133144
material: "/builtins/materials/gui.material"
134145
adjust_reference: ADJUST_REFERENCE_PARENT

druid/widget/properties_panel/properties/property_input.gui

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ nodes {
1515
texture: "druid/empty"
1616
id: "root"
1717
adjust_mode: ADJUST_MODE_STRETCH
18+
layer: "druid"
1819
inherit_alpha: true
1920
visible: false
2021
}
@@ -51,6 +52,7 @@ nodes {
5152
z: 1.0
5253
}
5354
parent: "root"
55+
layer: "druid_text_bold"
5456
inherit_alpha: true
5557
outline_alpha: 0.0
5658
shadow_alpha: 0.0
@@ -137,7 +139,14 @@ nodes {
137139
pivot: PIVOT_S
138140
adjust_mode: ADJUST_MODE_STRETCH
139141
parent: "E_Anchor"
142+
layer: "druid"
140143
inherit_alpha: true
141144
}
145+
layers {
146+
name: "druid"
147+
}
148+
layers {
149+
name: "druid_text_bold"
150+
}
142151
material: "/builtins/materials/gui.material"
143152
adjust_reference: ADJUST_REFERENCE_PARENT

druid/widget/properties_panel/properties/property_left_right_selector.gui

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ nodes {
1515
texture: "druid/empty"
1616
id: "root"
1717
adjust_mode: ADJUST_MODE_STRETCH
18+
layer: "druid"
1819
inherit_alpha: true
1920
visible: false
2021
}
@@ -51,6 +52,7 @@ nodes {
5152
z: 1.0
5253
}
5354
parent: "root"
55+
layer: "druid_text_bold"
5456
inherit_alpha: true
5557
outline_alpha: 0.0
5658
shadow_alpha: 0.0
@@ -88,6 +90,7 @@ nodes {
8890
texture: "druid/rect_round2_width2"
8991
id: "button_left"
9092
parent: "E_Anchor"
93+
layer: "druid"
9194
inherit_alpha: true
9295
slice9 {
9396
x: 5.0
@@ -109,6 +112,7 @@ nodes {
109112
texture: "druid/icon_arrow"
110113
id: "icon_left"
111114
parent: "button_left"
115+
layer: "druid"
112116
inherit_alpha: true
113117
size_mode: SIZE_MODE_AUTO
114118
}
@@ -129,6 +133,7 @@ nodes {
129133
texture: "druid/rect_round2_width2"
130134
id: "button_right"
131135
parent: "E_Anchor"
136+
layer: "druid"
132137
inherit_alpha: true
133138
slice9 {
134139
x: 5.0
@@ -147,6 +152,7 @@ nodes {
147152
texture: "druid/icon_arrow"
148153
id: "icon_right"
149154
parent: "button_right"
155+
layer: "druid"
150156
inherit_alpha: true
151157
size_mode: SIZE_MODE_AUTO
152158
}
@@ -170,6 +176,7 @@ nodes {
170176
pivot: PIVOT_S
171177
adjust_mode: ADJUST_MODE_STRETCH
172178
parent: "E_Anchor"
179+
layer: "druid"
173180
inherit_alpha: true
174181
}
175182
nodes {
@@ -204,9 +211,16 @@ nodes {
204211
z: 1.0
205212
}
206213
parent: "E_Anchor"
214+
layer: "druid_text_bold"
207215
inherit_alpha: true
208216
outline_alpha: 0.0
209217
shadow_alpha: 0.0
210218
}
219+
layers {
220+
name: "druid"
221+
}
222+
layers {
223+
name: "druid_text_bold"
224+
}
211225
material: "/builtins/materials/gui.material"
212226
adjust_reference: ADJUST_REFERENCE_PARENT

druid/widget/properties_panel/properties/property_slider.gui

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ nodes {
1515
texture: "druid/empty"
1616
id: "root"
1717
adjust_mode: ADJUST_MODE_STRETCH
18+
layer: "druid"
1819
inherit_alpha: true
1920
visible: false
2021
}
@@ -51,6 +52,7 @@ nodes {
5152
z: 1.0
5253
}
5354
parent: "root"
55+
layer: "druid_text_bold"
5456
inherit_alpha: true
5557
outline_alpha: 0.0
5658
shadow_alpha: 0.0
@@ -89,6 +91,7 @@ nodes {
8991
texture: "druid/empty"
9092
id: "slider"
9193
parent: "E_Anchor"
94+
layer: "druid"
9295
inherit_alpha: true
9396
}
9497
nodes {
@@ -105,6 +108,7 @@ nodes {
105108
texture: "druid/ui_circle_8"
106109
id: "slider_back"
107110
parent: "slider"
111+
layer: "druid"
108112
inherit_alpha: true
109113
slice9 {
110114
x: 4.0
@@ -130,6 +134,7 @@ nodes {
130134
texture: "druid/ui_circle_8"
131135
id: "slider_pin"
132136
parent: "slider"
137+
layer: "druid"
133138
inherit_alpha: true
134139
slice9 {
135140
x: 4.0
@@ -153,6 +158,7 @@ nodes {
153158
id: "button"
154159
pivot: PIVOT_E
155160
parent: "E_Anchor"
161+
layer: "druid"
156162
inherit_alpha: true
157163
slice9 {
158164
x: 4.0
@@ -180,6 +186,7 @@ nodes {
180186
pivot: PIVOT_SE
181187
adjust_mode: ADJUST_MODE_STRETCH
182188
parent: "button"
189+
layer: "druid"
183190
inherit_alpha: true
184191
}
185192
nodes {
@@ -214,9 +221,16 @@ nodes {
214221
z: 1.0
215222
}
216223
parent: "button"
224+
layer: "druid_text_bold"
217225
inherit_alpha: true
218226
outline_alpha: 0.0
219227
shadow_alpha: 0.0
220228
}
229+
layers {
230+
name: "druid"
231+
}
232+
layers {
233+
name: "druid_text_bold"
234+
}
221235
material: "/builtins/materials/gui.material"
222236
adjust_reference: ADJUST_REFERENCE_PARENT

druid/widget/properties_panel/properties/property_text.gui

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ nodes {
1515
texture: "druid/empty"
1616
id: "root"
1717
adjust_mode: ADJUST_MODE_STRETCH
18+
layer: "druid"
1819
inherit_alpha: true
1920
visible: false
2021
}
@@ -51,6 +52,7 @@ nodes {
5152
z: 1.0
5253
}
5354
parent: "root"
55+
layer: "druid_text_bold"
5456
inherit_alpha: true
5557
outline_alpha: 0.0
5658
shadow_alpha: 0.0
@@ -88,9 +90,16 @@ nodes {
8890
z: 1.0
8991
}
9092
parent: "root"
93+
layer: "druid_text_bold"
9194
inherit_alpha: true
9295
outline_alpha: 0.0
9396
shadow_alpha: 0.0
9497
}
98+
layers {
99+
name: "druid"
100+
}
101+
layers {
102+
name: "druid_text_bold"
103+
}
95104
material: "/builtins/materials/gui.material"
96105
adjust_reference: ADJUST_REFERENCE_PARENT

0 commit comments

Comments
 (0)