Fix pathdata and points editor focus nav, other improvements (#1784)

Author: MewPurPur

assets/icons/Visuals.svg

@@ -215,20 +215,20 @@ func _remove_control(overlay_ref: ColorRect = null) -> void:
 		return
 
 	overlay_ref = menu_stack.pop_at(matching_idx)
+	overlay_ref.tree_exited.connect(menus_or_popups_cleared.emit)
 	# If a visible control gets removed, unhide the previous one.
 	if overlay_ref.visible and matching_idx >= 1:
 		menu_stack[matching_idx - 1].show()
 	if is_instance_valid(overlay_ref):
 		overlay_ref.queue_free()
-	menus_or_popups_cleared.emit()
 	throw_mouse_motion_event()
 
 ## Frees all nodes in the menu_stack, emptying it.
 func remove_all_menus() -> void:
 	if not menu_stack.is_empty():
+		menu_stack[0].tree_exited.connect(menus_or_popups_cleared.emit)
 		while not menu_stack.is_empty():
 			menu_stack.pop_back().queue_free()
-		menus_or_popups_cleared.emit()
 		throw_mouse_motion_event()
 
 
@@ -294,16 +294,16 @@ func remove_popup(overlay_ref: Control = null) -> void:
 		return
 
 	overlay_ref = popup_stack.pop_at(matching_idx)
+	overlay_ref.tree_exited.connect(menus_or_popups_cleared.emit)
 	if is_instance_valid(overlay_ref):
 		overlay_ref.queue_free()
-	menus_or_popups_cleared.emit()
 	throw_mouse_motion_event()
 
 func remove_all_popups() -> void:
 	if not popup_stack.is_empty():
+		popup_stack[0].tree_exited.connect(menus_or_popups_cleared.emit)
 		while not popup_stack.is_empty():
 			popup_stack.pop_back().queue_free()
-		menus_or_popups_cleared.emit()
 		throw_mouse_motion_event()
 
 
@@ -445,6 +445,10 @@ func _input(event: InputEvent) -> void:
 			get_viewport().set_input_as_handled()
 			if not focus_owner.has_focus(true):
 				focus_owner.grab_focus()
+				if focus_owner.has_user_signal("visible_focus_changed"):
+					focus_owner.emit_signal("visible_focus_changed")
+				elif focus_owner.has_signal("visible_focus_changed"):
+					focus_owner.visible_focus_changed.emit()
 			else:
 				gather_focus(focus_owner, false).grab_focus()
 		elif ShortcutUtils.is_action_pressed(event, "ui_accept", true):
@@ -552,7 +556,7 @@ func _gather_focus_internal(control: Control, is_next: bool) -> Control:
 
 
 func is_node_on_top_menu_or_popup(node: Node) -> bool:
-	return ((menu_stack.is_empty() and popup_stack.is_empty()) or (popup_stack.is_empty() and\
+	return is_instance_valid(node) and ((menu_stack.is_empty() and popup_stack.is_empty()) or (popup_stack.is_empty() and\
 			menu_stack[-1].is_ancestor_of(node)) or (not popup_stack.is_empty() and not is_instance_valid(popup_submenu) and\
 			popup_stack[-1].is_ancestor_of(node)) or (is_instance_valid(popup_submenu) and popup_submenu.is_ancestor_of(node)))
 

src/autoload/HandlerGUI.gd

@@ -15,8 +15,8 @@ const _ELEMENT_ICONS: Dictionary[String, Texture2D] = {
 	"rect": preload("res://assets/icons/element/rect.svg"),
 	"path": preload("res://assets/icons/element/path.svg"),
 	"line": preload("res://assets/icons/element/line.svg"),
-	"polygon":  preload("res://assets/icons/element/polygon.svg"),
-	"polyline":  preload("res://assets/icons/element/polyline.svg"),
+	"polygon": preload("res://assets/icons/element/polygon.svg"),
+	"polyline": preload("res://assets/icons/element/polyline.svg"),
 	"svg": preload("res://assets/icons/element/svg.svg"),
 	"g": preload("res://assets/icons/element/g.svg"),
 	"linearGradient": preload("res://assets/icons/element/linearGradient.svg"),

src/data_classes/DB.gd

@@ -48,9 +48,9 @@ void fragment() {
 		vec2 dir = normalize(base_color.rgb * 2.0 - 1.0).xy;
 		float len = length(dir);
 		if (len > 0.00001) {
-		    dir /= len;
+			dir /= len;
 		} else {
-		    dir = vec2(0.0);
+			dir = vec2(0.0);
 		}
 		vec2 xy = dir * offset;
 		COLOR = vec4(vec3(xy, sqrt(max(0.0, 1.0 - dot(xy, xy)))) * 0.5 + 0.5, 1.0);

src/shaders/slider_visuals.gdshader

@@ -223,7 +223,7 @@ func _gui_input(event: InputEvent) -> void:
 					btn_arr.append(ContextButton.create_from_action("new_tab"))
 				else:
 					var new_active_tab := Configs.savedata.get_tab(hovered_idx)
-					var file_absent := not FileAccess.file_exists(new_active_tab.svg_file_path)
+					var external_file_missing := not FileAccess.file_exists(new_active_tab.svg_file_path)
 					var tab_count := Configs.savedata.get_tab_count()
 
 					var has_empty_tabs := false
@@ -246,10 +246,13 @@ func _gui_input(event: InputEvent) -> void:
 						func() -> ContextButton: return ContextButton.create_from_action("close_empty_tabs", not has_empty_tabs).set_icon_none(),
 						func() -> ContextButton: return ContextButton.create_from_action("close_saved_tabs", not has_saved_tabs).set_icon_none(),
 					]))
-					btn_arr.append(ContextButton.create_from_action("open_externally", file_absent))
-					btn_arr.append(ContextButton.create_from_action("open_in_folder", file_absent))
+					btn_arr.append(ContextButton.create_from_action("save"))
+					btn_arr.append(ContextButton.create_from_action("save_as").add_custom_text(Translator.translate("Save SVG as…")))
+					btn_arr.append(ContextButton.create_from_action("reset_svg", FileUtils.compare_svg_to_disk_contents() != FileUtils.FileState.DIFFERENT))
+					btn_arr.append(ContextButton.create_from_action("open_externally", external_file_missing))
+					btn_arr.append(ContextButton.create_from_action("open_in_folder", external_file_missing))
 
-				var tab_popup := ContextPopup.create(btn_arr, true, -1, PackedInt32Array([6]))
+				var tab_popup := ContextPopup.create(btn_arr, true, -1, PackedInt32Array([2, 5]))
 				if hovered_idx != -1:
 					var tab_global_rect := get_tab_rect(hovered_idx)
 					tab_global_rect.position += get_global_rect().position

src/ui_parts/tab_bar.gd

@@ -6,6 +6,8 @@ var ci := get_canvas_item()
 
 ## Emitted when Esc is pressed to cancel the current text change.
 signal text_change_canceled
+@warning_ignore("unused_signal")
+signal visible_focus_changed
 
 ## When turned on, uses the mono font for the tooltip.
 @export var mono_font_tooltip := false
@@ -57,7 +59,6 @@ func _on_base_class_editing_toggled(toggled_on: bool) -> void:
 			if get_global_rect().has_point(get_viewport().get_mouse_position()) and Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
 				first_click = true
 			text_before_edit = text
-			grab_focus()
 			if not first_click:
 				select_all()
 	else:
@@ -156,7 +157,9 @@ func _gui_input(event: InputEvent) -> void:
 	if event is InputEventMouseMotion and event.button_mask == 0:
 		queue_redraw()
 	elif event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_RIGHT and event.is_pressed():
-		grab_focus()
+		if not has_focus(true):
+			grab_focus()
+			visible_focus_changed.emit()
 		var btn_arr: Array[ContextButton] = []
 		var separator_arr := PackedInt32Array()
 
@@ -189,6 +192,10 @@ func _gui_input(event: InputEvent) -> void:
 		# Wow, no way to find out the column of a given click? Okay...
 		# TODO Make it so LineEdit caret automatically moves to the clicked position to finish the right-click logic.
 	elif event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_LEFT and event.is_pressed():
-		grab_focus(not has_focus())
+		if has_focus():
+			grab_focus()
+			visible_focus_changed.emit()
+		else:
+			grab_focus(true)
 		if not editable:
 			editing_toggled.emit(true)

src/ui_widgets/BetterLineEdit.gd

@@ -62,7 +62,8 @@ func _line_number_draw_callback(line: int, _gutter: int, region: Rect2) -> void:
 	# Center vertically, align to the left of the gutter.
 	var text_pos := Vector2(-5, region.get_center().y + font.get_ascent(font_size) - font.get_string_size(
 			line_number_text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size).y / 2)
-	draw_string(font, text_pos, line_number_text, HORIZONTAL_ALIGNMENT_RIGHT, _line_gutter_needed_space, font_size, ThemeUtils.dimmer_text_color)
+	draw_string(font, text_pos, line_number_text, HORIZONTAL_ALIGNMENT_RIGHT, _line_gutter_needed_space, font_size,
+			ThemeUtils.dim_text_color if (get_caret_line() == line and has_focus()) else ThemeUtils.subtle_text_color)
 
 
 func _exit_tree() -> void:
@@ -201,42 +202,55 @@ func _gui_input(event: InputEvent) -> void:
 
 	if event is InputEventMouseMotion and event.button_mask == 0:
 		queue_redraw()
-	elif event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_RIGHT and event.is_pressed():
-		grab_focus()
-		var btn_arr: Array[ContextButton] = []
-		var separator_arr := PackedInt32Array()
-		
-		var is_text_empty := text.is_empty()
-		
-		if editable:
-			var text_to_evaluate := get_selected_text() if has_selection() else text
-			var selection_evaluation := NumstringParser.evaluate(text_to_evaluate)
-			if not is_nan(selection_evaluation) and Utils.num_simple(selection_evaluation, Utils.MAX_NUMERIC_PRECISION) != text_to_evaluate:
-				btn_arr.append(ContextButton.create_from_action("evaluate"))
+	elif event is InputEventMouseButton and event.is_pressed():
+		if get_gutter_count() == 1 and event.position.x < get_gutter_width(0):
+			if event.button_index in [MOUSE_BUTTON_LEFT, MOUSE_BUTTON_MIDDLE, MOUSE_BUTTON_RIGHT]:
+				grab_focus()
+				var click_line := get_line_column_at_pos(event.position).y
+				if event.alt_pressed:
+					add_caret(click_line, 0)
+				else:
+					remove_secondary_carets()
+					deselect()
+					set_caret_line(click_line)
+					set_caret_column(0)
+				accept_event()
+		if event.button_index == MOUSE_BUTTON_RIGHT:
+			grab_focus()
+			var btn_arr: Array[ContextButton] = []
+			var separator_arr := PackedInt32Array()
 
-			if not btn_arr.is_empty():
-				separator_arr.append(btn_arr.size())
+			var is_text_empty := text.is_empty()
 
-			btn_arr.append(ContextButton.create_from_action("ui_undo", not has_undo()))
-			btn_arr.append(ContextButton.create_from_action("ui_redo", not has_redo()))
-			if DisplayServer.has_feature(DisplayServer.FEATURE_CLIPBOARD):
-				separator_arr.append(btn_arr.size())
-				btn_arr.append(ContextButton.create_from_action("ui_cut", is_text_empty))
+			if editable:
+				var text_to_evaluate := get_selected_text() if has_selection() else text
+				var selection_evaluation := NumstringParser.evaluate(text_to_evaluate)
+				if not is_nan(selection_evaluation) and Utils.num_simple(selection_evaluation, Utils.MAX_NUMERIC_PRECISION) != text_to_evaluate:
+					btn_arr.append(ContextButton.create_from_action("evaluate"))
+				
+				if not btn_arr.is_empty():
+					separator_arr.append(btn_arr.size())
+				
+				btn_arr.append(ContextButton.create_from_action("ui_undo", not has_undo()))
+				btn_arr.append(ContextButton.create_from_action("ui_redo", not has_redo()))
+				if DisplayServer.has_feature(DisplayServer.FEATURE_CLIPBOARD):
+					separator_arr.append(btn_arr.size())
+					btn_arr.append(ContextButton.create_from_action("ui_cut", is_text_empty))
+					btn_arr.append(ContextButton.create_from_action("ui_copy", is_text_empty))
+					btn_arr.append(ContextButton.create_from_action("ui_paste", not Utils.has_clipboard_web_safe()))
+					btn_arr.append(ContextButton.create_from_action("select_all", is_text_empty))
+			else:
 				btn_arr.append(ContextButton.create_from_action("ui_copy", is_text_empty))
-				btn_arr.append(ContextButton.create_from_action("ui_paste", not Utils.has_clipboard_web_safe()))
 				btn_arr.append(ContextButton.create_from_action("select_all", is_text_empty))
-		else:
-			btn_arr.append(ContextButton.create_from_action("ui_copy", is_text_empty))
-			btn_arr.append(ContextButton.create_from_action("select_all", is_text_empty))
-		
-		var vp := get_viewport()
-		HandlerGUI.popup_under_pos(ContextPopup.create(btn_arr, true, -1, separator_arr), vp.get_mouse_position(), vp)
-		accept_event()
-		var click_pos := get_line_column_at_pos(event.position)
-		if get_selection_at_line_column(click_pos.y, click_pos.x) == -1:
-			deselect()
-			set_caret_line(click_pos.y, false)
-			set_caret_column(click_pos.x, false)
+			
+			var vp := get_viewport()
+			HandlerGUI.popup_under_pos(ContextPopup.create(btn_arr, true, -1, separator_arr), vp.get_mouse_position(), vp)
+			accept_event()
+			var click_pos := get_line_column_at_pos(event.position)
+			if get_selection_at_line_column(click_pos.y, click_pos.x) == -1:
+				deselect()
+				set_caret_line(click_pos.y, false)
+				set_caret_column(click_pos.x, false)
 	else:
 		# Set these inputs as handled, so the default UndoRedo doesn't eat them.
 		if ShortcutUtils.is_action_pressed(event, "ui_undo"):

src/ui_widgets/BetterTextEdit.gd

@@ -51,9 +51,8 @@ shader_parameter/inverted = false
 shader_parameter/interpolation = 0
 
 [node name="GoodColorPicker" type="MarginContainer" unique_id=2024296627]
-offset_top = 347.0
-offset_right = 200.0
-offset_bottom = 347.0
+offset_right = 212.0
+offset_bottom = 353.0
 theme_override_constants/margin_left = 6
 theme_override_constants/margin_top = 6
 theme_override_constants/margin_right = 6

src/ui_widgets/good_color_picker.tscn

@@ -331,7 +331,7 @@ func _draw() -> void:
 					for i in range(270, 360):
 						var d := i * TAU/360
 						points[i - 268] = Vector2(x + rect_width - rx, y + ry) + Vector2(cos(d) * rx, sin(d) * ry)
-					points[92] =  Vector2(x + rect_width, y + rect_height - ry)
+					points[92] = Vector2(x + rect_width, y + rect_height - ry)
 					for i in range(0, 90):
 						var d := i * TAU/360
 						points[i + 93] = Vector2(x + rect_width - rx, y + rect_height - ry) + Vector2(cos(d) * rx, sin(d) * ry)