Add neutral gray theme

Author: MewPurPur

godot_only/scripts/update_translations.gd

@@ -16,6 +16,7 @@ const COMMENTS_DICT: Dictionary[String, String] = {
 	"Previews": "Refers to a part of the layout where icons are previewed at various sizes.",
 	"Dark": "Refers to a theme preset.",
 	"Light": "Refers to a theme preset.",
+	"Gray": "Refers to a theme preset.",
 	"Black (OLED)": "Refers to a theme preset.",
 	"translation-credits": "Translators (comma-separated): Name or alias, optionally followed by an email in angle brackets <email@example.com>.\nUsed for credits. Adding yourself is optional. New entries go at the end. Don't remove or rearrange existing entries.",
 	"Evaluate": """Refers to evaluating an expression such as "sin(2*pi/5)"."""

src/config_classes/SaveData.gd

@@ -1,6 +1,6 @@
 class_name SaveData extends ConfigResource
 
-enum ThemePreset {DARK, LIGHT, BLACK}
+enum ThemePreset {DARK, LIGHT, BLACK, GRAY}
 enum HighlighterPreset {DEFAULT_DARK, DEFAULT_LIGHT}
 
 const GoodColorPicker = preload("res://src/ui_widgets/good_color_picker.gd")
@@ -20,14 +20,16 @@ func get_setting_default(setting: String) -> Variant:
 				ThemePreset.DARK: return Color("1a1a1a")
 				ThemePreset.LIGHT: return Color("e6e6ff")
 				ThemePreset.BLACK: return Color("000")
+				ThemePreset.GRAY: return Color("262626")
 		"accent_color":
 			match theme_preset:
 				ThemePreset.DARK: return Color("3e8cfc")
 				ThemePreset.LIGHT: return Color("0053a6")
 				ThemePreset.BLACK: return Color("7c8dbf")
+				ThemePreset.GRAY: return Color("80aaff")
 		"highlighter_preset":
 			match theme_preset:
-				ThemePreset.DARK, ThemePreset.BLACK: return HighlighterPreset.DEFAULT_DARK
+				ThemePreset.DARK, ThemePreset.BLACK, ThemePreset.GRAY: return HighlighterPreset.DEFAULT_DARK
 				ThemePreset.LIGHT: return HighlighterPreset.DEFAULT_LIGHT
 		"highlighting_symbol_color":
 			match highlighter_preset:
@@ -63,22 +65,22 @@ func get_setting_default(setting: String) -> Variant:
 				HighlighterPreset.DEFAULT_LIGHT: return Color("cc0000")
 		"basic_color_valid":
 			match theme_preset:
-				ThemePreset.DARK, ThemePreset.BLACK: return Color("9f9")
+				ThemePreset.DARK, ThemePreset.BLACK, ThemePreset.GRAY: return Color("9f9")
 				ThemePreset.LIGHT: return Color("2b2")
 		"basic_color_error":
 			match theme_preset:
-				ThemePreset.DARK, ThemePreset.BLACK: return Color("f99")
+				ThemePreset.DARK, ThemePreset.BLACK, ThemePreset.GRAY: return Color("f99")
 				ThemePreset.LIGHT: return Color("b22")
 		"basic_color_warning":
 			match theme_preset:
-				ThemePreset.DARK, ThemePreset.BLACK: return Color("ee6")
+				ThemePreset.DARK, ThemePreset.BLACK, ThemePreset.GRAY: return Color("ee6")
 				ThemePreset.LIGHT: return Color("991")
 		"handle_size": return 1.0 if OS.get_name() != "Android" else 2.0
 		"handle_inner_color": return Color("fff")
 		"handle_color": return Color("111")
 		"handle_hovered_color":
 			match theme_preset:
-				ThemePreset.DARK, ThemePreset.BLACK: return Color("aaa")
+				ThemePreset.DARK, ThemePreset.BLACK, ThemePreset.GRAY: return Color("aaa")
 				ThemePreset.LIGHT: return Color("808080")
 		"handle_selected_color": return Color("46f")
 		"handle_hovered_selected_color": return Color("f44")
@@ -92,10 +94,12 @@ func get_setting_default(setting: String) -> Variant:
 				ThemePreset.DARK: return Color("1a1a1a")
 				ThemePreset.LIGHT: return Color("fff")
 				ThemePreset.BLACK: return Color("000")
+				ThemePreset.GRAY: return Color("404040")
 		"grid_color":
 			match theme_preset:
 				ThemePreset.DARK, ThemePreset.BLACK: return Color("808080")
 				ThemePreset.LIGHT: return Color("666")
+				ThemePreset.GRAY: return Color("999")
 
 		"invert_zoom": return false
 		"wraparound_panning": return false
@@ -161,6 +165,7 @@ static func get_theme_preset_value_text_map() -> Dictionary:
 		ThemePreset.DARK: Translator.translate("Dark"),
 		ThemePreset.LIGHT: Translator.translate("Light"),
 		ThemePreset.BLACK: Translator.translate("Black (OLED)"),
+		ThemePreset.GRAY: Translator.translate("Gray")
 	}
 
 const HIGHLIGHTING_ITEMS: PackedStringArray = [

src/ui_widgets/BetterButton.gd

@@ -1,4 +1,4 @@
-## A regular Button with some helpers for hover + press theming situations and shortcuts.
+## A regular Button with some helpers for shortcuts.
 @icon("res://godot_only/icons/BetterButton.svg")
 class_name BetterButton extends Button
 

src/ui_widgets/id_field.gd

@@ -30,6 +30,8 @@ func sync_localization() -> void:
 func setup_font() -> void:
 	if text.is_empty():
 		add_theme_font_override("font", ThemeUtils.main_font)
+	else:
+		remove_theme_font_override("font")
 
 
 func _on_element_attribute_changed(attribute_changed: String) -> void:

src/ui_widgets/number_field_with_slider.gd

@@ -18,19 +18,16 @@ func set_value(new_value: String, save := false) -> void:
 				sync()
 				return
 
-			if numeric_value > MAX_VALUE:
-				numeric_value = MAX_VALUE
-			elif numeric_value < MIN_VALUE:
-				numeric_value = MIN_VALUE
-			new_value = element.get_attribute(attribute_name).num_to_text(numeric_value)
+			numeric_value = clampf(numeric_value, MIN_VALUE, MAX_VALUE)
+			new_value = NumberParser.num_to_text(numeric_value, Configs.savedata.editor_formatter)
 
 	element.set_attribute(attribute_name, new_value)
 	sync()
 	if save:
 		State.save_svg()
 
 func set_num(new_number: float, save := false) -> void:
-	set_value(element.get_attribute(attribute_name).num_to_text(new_number), save)
+	set_value(NumberParser.num_to_text(new_number, Configs.savedata.editor_formatter), save)
 
 func setup_placeholder() -> void:
 	placeholder_text = element.get_default(attribute_name)
@@ -78,9 +75,8 @@ var slider_dragged := false:
 			queue_redraw()
 			if not slider_hovered:
 				get_viewport().update_mouse_cursor_state()
-				# FIXME workaround because "button_pressed" remains true
-				# if you unclick while outside of the area, for some reason.
-				# Couldn't replicate this in a minimal project.
+				# FIXME workaround because "button_pressed" remains true if you unclick while
+				# outside of the area, for some reason. Couldn't replicate this in a minimal project.
 				remove_child(temp_button)
 				add_child(temp_button)
 

translations/VectorTouch.pot

@@ -145,6 +145,11 @@ msgstr ""
 msgid "Black (OLED)"
 msgstr ""
 
+#. Refers to a theme preset.
+#: src/config_classes/SaveData.gd
+msgid "Gray"
+msgstr ""
+
 #: src/config_classes/SaveData.gd
 msgid "Default Dark"
 msgstr ""

translations/bg.po

@@ -146,6 +146,11 @@ msgstr "Светла"
 msgid "Black (OLED)"
 msgstr "Черна (OLED)"
 
+#. Refers to a theme preset.
+#: src/config_classes/SaveData.gd
+msgid "Gray"
+msgstr "Сива"
+
 #: src/config_classes/SaveData.gd
 msgid "Default Dark"
 msgstr "Тъмна по подразбиране"

translations/de.po

@@ -147,6 +147,11 @@ msgstr "Höhe"
 msgid "Black (OLED)"
 msgstr ""
 
+#. Refers to a theme preset.
+#: src/config_classes/SaveData.gd
+msgid "Gray"
+msgstr ""
+
 #: src/config_classes/SaveData.gd
 msgid "Default Dark"
 msgstr ""

translations/en.po

@@ -146,6 +146,11 @@ msgstr ""
 msgid "Black (OLED)"
 msgstr ""
 
+#. Refers to a theme preset.
+#: src/config_classes/SaveData.gd
+msgid "Gray"
+msgstr ""
+
 #: src/config_classes/SaveData.gd
 msgid "Default Dark"
 msgstr ""

translations/es.po

@@ -147,6 +147,11 @@ msgstr "Alto"
 msgid "Black (OLED)"
 msgstr ""
 
+#. Refers to a theme preset.
+#: src/config_classes/SaveData.gd
+msgid "Gray"
+msgstr ""
+
 #: src/config_classes/SaveData.gd
 msgid "Default Dark"
 msgstr ""