Skip to content

Commit 3267242

Browse files
committed
DragManager: Remove class_name from internal scripts
These are now always preloaded in the scripts that depend on them. Makes the plugin work again after enabling it. https://phabricator.endlessm.com/T35574
1 parent a064abb commit 3267242

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

addons/block_code/block_code_plugin.gd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ var old_feature_profile: String = ""
1818

1919
const DISABLED_CLASSES := [
2020
"BlockScriptData",
21-
"DragManager",
2221
"InstructionTree",
2322
"Types",
2423
"Block",
2524
"ControlBlock",
2625
"ParameterBlock",
2726
"StatementBlock",
28-
"DragDropArea",
2927
"SnapPoint",
3028
"SerializedBlockTreeNodeArray",
3129
"SerializedBlockTreeNode",

addons/block_code/drag_manager/drag.gd

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ extends Control
44
const Constants = preload("res://addons/block_code/ui/constants.gd")
55
const DragManager = preload("res://addons/block_code/drag_manager/drag_manager.gd")
66

7+
enum DragAction { NONE, PLACE, REMOVE }
8+
79
var _block: Block
810
var _block_scope: String
911
var _block_canvas: BlockCanvas
1012
var _preview_block: Control
1113
var _snap_points: Array[Node]
1214
var _delete_areas: Array[Rect2]
13-
var action: DragManager.DragAction:
15+
var action: DragAction:
1416
get:
1517
return action
1618
set(value):
@@ -60,22 +62,22 @@ func update_drag_state():
6062

6163
for rect in _delete_areas:
6264
if rect.has_point(get_global_mouse_position()):
63-
action = DragManager.DragAction.REMOVE
65+
action = DragAction.REMOVE
6466
target_snap_point = null
6567
return
6668

67-
action = DragManager.DragAction.PLACE
69+
action = DragAction.PLACE
6870

6971
target_snap_point = _find_closest_snap_point()
7072

7173

7274
func apply_drag() -> Block:
7375
update_drag_state()
7476

75-
if action == DragManager.DragAction.PLACE:
77+
if action == DragAction.PLACE:
7678
_place_block()
7779
return _block
78-
elif action == DragManager.DragAction.REMOVE:
80+
elif action == DragAction.REMOVE:
7981
_remove_block()
8082
return null
8183
else:
@@ -172,7 +174,7 @@ func _get_distance_to_snap_point(snap_point: SnapPoint) -> float:
172174

173175
func _update_action_hint():
174176
match action:
175-
DragManager.DragAction.REMOVE:
177+
DragAction.REMOVE:
176178
_block.modulate = Color(1.0, 1.0, 1.0, 0.5)
177179
_:
178180
_block.modulate = Color.WHITE

addons/block_code/drag_manager/drag_manager.gd

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@tool
2-
class_name DragManager
32
extends Control
43

54
signal block_dropped
@@ -12,8 +11,6 @@ const Drag = preload("res://addons/block_code/drag_manager/drag.gd")
1211

1312
const Constants = preload("res://addons/block_code/ui/constants.gd")
1413

15-
enum DragAction { NONE, PLACE, REMOVE }
16-
1714
var _picker: Picker
1815
var _block_canvas: BlockCanvas
1916

addons/block_code/ui/block_canvas/block_canvas.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
class_name BlockCanvas
33
extends MarginContainer
44

5+
const DragManager = preload("res://addons/block_code/drag_manager/drag_manager.gd")
56
const Util = preload("res://addons/block_code/ui/util.gd")
67

78
const EXTEND_MARGIN: float = 800

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ class_name ControlBlock
33
extends Block
44

55
const Constants = preload("res://addons/block_code/ui/constants.gd")
6+
const DragDropArea = preload("res://addons/block_code/ui/blocks/utilities/drag_drop_area/drag_drop_area.gd")
67

78
@export var block_formats: Array = []
89
@export var statements: Array = []

addons/block_code/ui/blocks/utilities/drag_drop_area/drag_drop_area.gd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@tool
2-
class_name DragDropArea
32
extends MarginContainer
43

54
signal mouse_down

addons/block_code/ui/main_panel.gd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
class_name MainPanel
33
extends Control
44

5+
const DragManager = preload("res://addons/block_code/drag_manager/drag_manager.gd")
6+
57
@onready var _picker: Picker = %Picker
68
@onready var _block_canvas: BlockCanvas = %BlockCanvas
79
@onready var _drag_manager: DragManager = %DragManager

0 commit comments

Comments
 (0)