Skip to content

Commit d2495b0

Browse files
committed
Use class instantiators for block background scripts
https://phabricator.endlessm.com/T35538
1 parent c92f254 commit d2495b0

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

addons/block_code/drag_manager/drag.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@tool
22
extends Control
33

4+
const Background = preload("res://addons/block_code/ui/blocks/utilities/background/background.gd")
45
const BlockCanvas = preload("res://addons/block_code/ui/block_canvas/block_canvas.gd")
56
const Constants = preload("res://addons/block_code/ui/constants.gd")
67
const InstructionTree = preload("res://addons/block_code/instruction_tree/instruction_tree.gd")
@@ -189,8 +190,7 @@ func _update_preview():
189190

190191
if target_snap_point:
191192
# Make preview block
192-
_preview_block = Control.new()
193-
_preview_block.set_script(preload("res://addons/block_code/ui/blocks/utilities/background/background.gd"))
193+
_preview_block = Background.new()
194194

195195
_preview_block.color = Color(1, 1, 1, 0.5)
196196
_preview_block.custom_minimum_size = _block.get_global_rect().size

addons/block_code/ui/blocks/control_block/control_block.gd

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
class_name ControlBlock
33
extends Block
44

5+
const Background = preload("res://addons/block_code/ui/blocks/utilities/background/background.gd")
56
const Constants = preload("res://addons/block_code/ui/constants.gd")
67
const DragDropArea = preload("res://addons/block_code/ui/blocks/utilities/drag_drop_area/drag_drop_area.gd")
8+
const Gutter = preload("res://addons/block_code/ui/blocks/utilities/background/gutter.gd")
79

810
@export var block_formats: Array = []
911
@export var statements: Array = []
@@ -104,9 +106,8 @@ func format():
104106
row.custom_minimum_size.y = 30
105107
row.size_flags_horizontal = Control.SIZE_SHRINK_BEGIN
106108

107-
var bg := Control.new()
109+
var bg := Background.new()
108110
bg.name = "Background"
109-
bg.set_script(preload("res://addons/block_code/ui/blocks/utilities/background/background.gd"))
110111
bg.color = color
111112
if i != 0:
112113
bg.shift_top = Constants.CONTROL_MARGIN
@@ -144,9 +145,8 @@ func format():
144145
snap_container.custom_minimum_size.y = 30
145146
snap_container.size_flags_horizontal = Control.SIZE_SHRINK_BEGIN
146147

147-
var snap_gutter := Control.new()
148+
var snap_gutter := Gutter.new()
148149
snap_gutter.name = "Background"
149-
snap_gutter.set_script(preload("res://addons/block_code/ui/blocks/utilities/background/gutter.gd"))
150150
snap_gutter.custom_minimum_size.x = Constants.CONTROL_MARGIN
151151
snap_gutter.size_flags_horizontal = Control.SIZE_SHRINK_BEGIN
152152
snap_gutter.size_flags_vertical = Control.SIZE_EXPAND_FILL
@@ -161,11 +161,10 @@ func format():
161161

162162
%Rows.add_child(snap_container)
163163

164-
var bg := Control.new()
164+
var bg := Background.new()
165165
bg.size_flags_horizontal = Control.SIZE_SHRINK_BEGIN
166166
bg.custom_minimum_size.x = 100
167167
bg.custom_minimum_size.y = 30
168-
bg.set_script(preload("res://addons/block_code/ui/blocks/utilities/background/background.gd"))
169168
bg.color = color
170169
bg.shift_top = Constants.CONTROL_MARGIN
171170
%Rows.add_child(bg)

0 commit comments

Comments
 (0)