fixup! Entry restyle and hexagonal booleans

background_variant -> is_pointy

Author: manuq

addons/block_code/ui/blocks/parameter_block/parameter_block.gd

@@ -21,7 +21,7 @@ func _ready():
 
 	if not definition == null and definition.variant_type == Variant.Type.TYPE_BOOL:
 		_background.visible = true
-		_background.background_variant = _background.POINTED
+		_background.is_pointy = true
 		_background.color = color
 		_panel.visible = false
 	else:

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

@@ -33,11 +33,8 @@ enum { BODY, HEADER }
 @export var top_variant := BODY:
 	set = _set_top_variant
 
-enum { FLAT, POINTED }
-
-## Style of the background |FLAT|, <POINTED>
-@export var background_variant := FLAT:
-	set = _set_background_variant
+@export var is_pointy: bool = false:
+	set = _set_is_pointy
 
 
 func _set_color(new_color):
@@ -76,8 +73,8 @@ func _set_top_variant(new_variant):
 	queue_redraw()
 
 
-func _set_background_variant(new_variant):
-	background_variant = clamp(new_variant, FLAT, POINTED)
+func _set_is_pointy(new_is_pointy):
+	is_pointy = new_is_pointy
 	queue_redraw()
 
 
@@ -127,7 +124,7 @@ func _draw():
 		fill_polygon.append_array(top_knob)
 
 	# Right side
-	if background_variant == POINTED:
+	if is_pointy:
 		# Top
 		fill_polygon.append(Vector2(size.x - Constants.POINTY_WIDTH, 0.0))
 
@@ -147,7 +144,7 @@ func _draw():
 		fill_polygon.append(Vector2(bottom_left_align, size.y))
 
 	# Left side
-	if background_variant == POINTED:
+	if is_pointy:
 		# Bottom
 		fill_polygon.append(Vector2(Constants.POINTY_WIDTH, size.y))
 
@@ -168,7 +165,7 @@ func _draw():
 		var outline_middle := Constants.OUTLINE_WIDTH / 2
 
 		# Top line
-		if background_variant == POINTED:
+		if is_pointy:
 			stroke_polygon.append(Vector2(shift_top - (0.0 if not shift_top > 0 else outline_middle) + Constants.POINTY_WIDTH, 0.0))
 		else:
 			stroke_polygon.append(Vector2(shift_top - (0.0 if not shift_top > 0 else outline_middle), 0.0))
@@ -177,7 +174,7 @@ func _draw():
 			stroke_polygon.append_array(top_knob)
 
 		# Right line
-		if background_variant == POINTED:
+		if is_pointy:
 			# Top
 			stroke_polygon.append(Vector2(size.x - Constants.POINTY_WIDTH, 0.0))
 
@@ -197,7 +194,7 @@ func _draw():
 			stroke_polygon.append(Vector2(bottom_left_align, size.y))
 
 		# Left line
-		if background_variant == POINTED:
+		if is_pointy:
 			stroke_polygon.append(Vector2(shift_bottom - (outline_middle if shift_bottom > 0 else 0.0) + Constants.POINTY_WIDTH, size.y))
 			edge_polygon.append(Vector2(Constants.POINTY_WIDTH + outline_middle, 0.0))
 

addons/block_code/ui/blocks/utilities/background/gutter.gd

@@ -10,9 +10,8 @@ var parent_block: Block
 @export var color: Color:
 	set = _set_color
 
-## Variant
-@export var background_variant := false:
-	set = _set_background_variant
+@export var is_pointy: bool = false:
+	set = _set_is_pointy
 
 
 func _set_color(new_color):
@@ -21,8 +20,8 @@ func _set_color(new_color):
 	queue_redraw()
 
 
-func _set_background_variant(new_variant):
-	background_variant = new_variant
+func _set_is_pointy(new_is_pointy):
+	is_pointy = new_is_pointy
 	queue_redraw()
 
 
@@ -34,20 +33,20 @@ func _ready():
 
 func _draw():
 	var fill_polygon: PackedVector2Array
-	fill_polygon.append(Vector2(Constants.POINTY_WIDTH if background_variant else 0.0, 0.0))
-	fill_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if background_variant else 0.0), 0.0))
-	fill_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if background_variant else 0.0), size.y))
-	fill_polygon.append(Vector2(Constants.POINTY_WIDTH if background_variant else 0.0, size.y))
-	fill_polygon.append(Vector2(Constants.POINTY_WIDTH if background_variant else 0.0, 0.0))
+	fill_polygon.append(Vector2(Constants.POINTY_WIDTH if is_pointy else 0.0, 0.0))
+	fill_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if is_pointy else 0.0), 0.0))
+	fill_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if is_pointy else 0.0), size.y))
+	fill_polygon.append(Vector2(Constants.POINTY_WIDTH if is_pointy else 0.0, size.y))
+	fill_polygon.append(Vector2(Constants.POINTY_WIDTH if is_pointy else 0.0, 0.0))
 
 	var left_polygon: PackedVector2Array
 	var right_polygon: PackedVector2Array
 
-	left_polygon.append(Vector2(Constants.POINTY_WIDTH if background_variant else 0.0, 0.0))
-	left_polygon.append(Vector2(Constants.POINTY_WIDTH if background_variant else 0.0, size.y))
+	left_polygon.append(Vector2(Constants.POINTY_WIDTH if is_pointy else 0.0, 0.0))
+	left_polygon.append(Vector2(Constants.POINTY_WIDTH if is_pointy else 0.0, size.y))
 
-	right_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if background_variant else 0.0), 0.0))
-	right_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if background_variant else 0.0), size.y))
+	right_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if is_pointy else 0.0), 0.0))
+	right_polygon.append(Vector2(size.x + (Constants.POINTY_WIDTH if is_pointy else 0.0), size.y))
 
 	draw_colored_polygon(fill_polygon, color)
 	draw_polyline(left_polygon, Constants.FOCUS_BORDER_COLOR if parent_block.has_focus() else outline_color, Constants.OUTLINE_WIDTH)

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

@@ -217,7 +217,7 @@ func _update_visible_input():
 			TYPE_VECTOR2:
 				_switch_input(_vector2_input)
 			TYPE_BOOL:
-				_background.background_variant = _background.POINTED
+				_background.is_pointy = true
 				_switch_input(_bool_input)
 			_:
 				_switch_input(_text_input)