From d4c26f0ad59c12e4df5ca460184ac5edfebe6f48 Mon Sep 17 00:00:00 2001 From: Matt Parker <61717342+MattParkerDev@users.noreply.github.com> Date: Sat, 13 Sep 2025 10:57:45 +1000 Subject: [PATCH] fix terminal font --- .../BottomPanel/BottomPanelManager.cs | 2 +- .../Features/Build/BuildPanel.tscn | 4 +- .../Features/Run/RunPanelTab.tscn | 15 ++--- .../Features/TerminalBase/TerminalTheme.tres | 65 +++++++++++++++++++ src/SharpIDE.Godot/IdeRoot.tscn | 12 ++-- 5 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 src/SharpIDE.Godot/Features/TerminalBase/TerminalTheme.tres diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs index 7d56e39..c2f491e 100644 --- a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs +++ b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs @@ -4,7 +4,7 @@ using SharpIDE.Godot.Features.Problems; namespace SharpIDE.Godot.Features.BottomPanel; -public partial class BottomPanelManager : Panel +public partial class BottomPanelManager : MarginContainer { public SharpIdeSolutionModel? Solution { diff --git a/src/SharpIDE.Godot/Features/Build/BuildPanel.tscn b/src/SharpIDE.Godot/Features/Build/BuildPanel.tscn index 6ba2ad7..502cddd 100644 --- a/src/SharpIDE.Godot/Features/Build/BuildPanel.tscn +++ b/src/SharpIDE.Godot/Features/Build/BuildPanel.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=3 uid="uid://co6dkhdolriej"] +[gd_scene load_steps=3 format=3 uid="uid://co6dkhdolriej"] [ext_resource type="Script" uid="uid://dt46krpl6ds28" path="res://Features/Build/BuildPanel.cs" id="1_tx1bg"] +[ext_resource type="Theme" uid="uid://bswaamju2blyt" path="res://Features/TerminalBase/TerminalTheme.tres" id="2_5bb6p"] [node name="BuildPanel" type="Control"] layout_mode = 3 @@ -44,3 +45,4 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 size_flags_vertical = 3 +theme = ExtResource("2_5bb6p") diff --git a/src/SharpIDE.Godot/Features/Run/RunPanelTab.tscn b/src/SharpIDE.Godot/Features/Run/RunPanelTab.tscn index addf181..5548060 100644 --- a/src/SharpIDE.Godot/Features/Run/RunPanelTab.tscn +++ b/src/SharpIDE.Godot/Features/Run/RunPanelTab.tscn @@ -1,24 +1,17 @@ [gd_scene load_steps=3 format=3 uid="uid://cjopkm4osnp27"] [ext_resource type="Script" uid="uid://ouskvcd0yaub" path="res://Features/Run/RunPanelTab.cs" id="1_dx3i6"] +[ext_resource type="Theme" uid="uid://bswaamju2blyt" path="res://Features/TerminalBase/TerminalTheme.tres" id="2_6d1fj"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dx3i6"] -bg_color = Color(0.129589, 0.120703, 0.112057, 1) - -[node name="RunPanelTab" type="Panel"] +[node name="RunPanelTab" type="MarginContainer"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_dx3i6") script = ExtResource("1_dx3i6") [node name="Terminal" type="Terminal" parent="."] copy_on_selection = true -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 +layout_mode = 2 +theme = ExtResource("2_6d1fj") diff --git a/src/SharpIDE.Godot/Features/TerminalBase/TerminalTheme.tres b/src/SharpIDE.Godot/Features/TerminalBase/TerminalTheme.tres new file mode 100644 index 0000000..bc368b5 --- /dev/null +++ b/src/SharpIDE.Godot/Features/TerminalBase/TerminalTheme.tres @@ -0,0 +1,65 @@ +[gd_resource type="Theme" load_steps=4 format=3 uid="uid://bswaamju2blyt"] + +[ext_resource type="FontVariation" uid="uid://vmgmcu8gc6nt" path="res://addons/godot_xterm/themes/fonts/regular.tres" id="1_7v0pk"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_bk23l"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(1, 1, 1, 0.75) +draw_center = false +border_width_left = 2 +border_width_top = 2 +border_width_right = 2 +border_width_bottom = 2 +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 +expand_margin_left = 2.0 +expand_margin_top = 2.0 +expand_margin_right = 2.0 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5srvn"] +content_margin_left = 4.0 +content_margin_top = 4.0 +content_margin_right = 4.0 +content_margin_bottom = 4.0 +bg_color = Color(0.1, 0.1, 0.1, 0.6) +border_width_bottom = 2 +border_color = Color(0, 0, 0, 0.6) +corner_radius_top_left = 3 +corner_radius_top_right = 3 +corner_radius_bottom_right = 3 +corner_radius_bottom_left = 3 +corner_detail = 5 + +[resource] +Terminal/colors/ansi_0_color = Color(0, 0, 0, 1) +Terminal/colors/ansi_10_color = Color(0, 1, 0, 1) +Terminal/colors/ansi_11_color = Color(1, 1, 0, 1) +Terminal/colors/ansi_12_color = Color(0.360784, 0.360784, 1, 1) +Terminal/colors/ansi_13_color = Color(1, 0, 1, 1) +Terminal/colors/ansi_14_color = Color(0, 1, 1, 1) +Terminal/colors/ansi_15_color = Color(1, 1, 1, 1) +Terminal/colors/ansi_1_color = Color(0.803922, 0, 0, 1) +Terminal/colors/ansi_2_color = Color(0, 0.803922, 0, 1) +Terminal/colors/ansi_3_color = Color(0.803922, 0.803922, 0, 1) +Terminal/colors/ansi_4_color = Color(0, 0, 0.933333, 1) +Terminal/colors/ansi_5_color = Color(0.803922, 0, 0.803922, 1) +Terminal/colors/ansi_6_color = Color(0, 0.803922, 0.803922, 1) +Terminal/colors/ansi_7_color = Color(0.898039, 0.898039, 0.898039, 1) +Terminal/colors/ansi_8_color = Color(0.498039, 0.498039, 0.498039, 1) +Terminal/colors/ansi_9_color = Color(1, 0, 0, 1) +Terminal/colors/background_color = Color(0, 0, 0, 0) +Terminal/colors/foreground_color = Color(0.875, 0.875, 0.875, 1) +Terminal/font_sizes/font_size = 16 +Terminal/fonts/bold_font = ExtResource("1_7v0pk") +Terminal/fonts/bold_italics_font = ExtResource("1_7v0pk") +Terminal/fonts/italics_font = ExtResource("1_7v0pk") +Terminal/fonts/normal_font = ExtResource("1_7v0pk") +Terminal/styles/focus = SubResource("StyleBoxFlat_bk23l") +Terminal/styles/normal = SubResource("StyleBoxFlat_5srvn") diff --git a/src/SharpIDE.Godot/IdeRoot.tscn b/src/SharpIDE.Godot/IdeRoot.tscn index f2b467a..bd88965 100644 --- a/src/SharpIDE.Godot/IdeRoot.tscn +++ b/src/SharpIDE.Godot/IdeRoot.tscn @@ -110,7 +110,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 0 -split_offset = 402 +split_offset = -175 script = ExtResource("3_0ybuf") metadata/_custom_type_script = "uid://kvnhndc3l6ih" @@ -148,7 +148,7 @@ item_count = 1 item_0/text = "Getting Context Actions..." item_0/id = 0 -[node name="BottomPanel" type="Panel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer"] +[node name="BottomPanel" type="MarginContainer" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer"] unique_name_in_owner = true layout_mode = 2 script = ExtResource("7_i62lx") @@ -156,21 +156,21 @@ script = ExtResource("7_i62lx") [node name="ProblemsPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("11_b7c1a")] unique_name_in_owner = true visible = false -layout_mode = 1 +layout_mode = 2 [node name="RunPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("5_y3aoi")] unique_name_in_owner = true -layout_mode = 1 +layout_mode = 2 [node name="DebugPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("11_s2dv6")] unique_name_in_owner = true visible = false -layout_mode = 1 +layout_mode = 2 [node name="BuildPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("9_rllbf")] unique_name_in_owner = true visible = false -layout_mode = 1 +layout_mode = 2 [node name="OpenSolutionDialog" type="FileDialog" parent="."] unique_name_in_owner = true