diff --git a/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs b/src/SharpIDE.Godot/Features/BottomPanel/BottomPanelManager.cs index c2f491e..7d56e39 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 : MarginContainer +public partial class BottomPanelManager : Panel { public SharpIdeSolutionModel? Solution { diff --git a/src/SharpIDE.Godot/Features/Debug_/DebugPanel.cs b/src/SharpIDE.Godot/Features/Debug_/DebugPanel.cs index 6236e42..c0620fe 100644 --- a/src/SharpIDE.Godot/Features/Debug_/DebugPanel.cs +++ b/src/SharpIDE.Godot/Features/Debug_/DebugPanel.cs @@ -8,7 +8,7 @@ namespace SharpIDE.Godot.Features.Debug_; public partial class DebugPanel : Control { private TabBar _tabBar = null!; - private Panel _tabsPanel = null!; + private MarginContainer _tabsPanel = null!; [Export] public Texture2D RunningIcon { get; set; } = null!; @@ -21,7 +21,7 @@ public partial class DebugPanel : Control _tabBar.ClearTabs(); //_tabBar.TabClosePressed _tabBar.TabClicked += OnTabBarTabClicked; - _tabsPanel = GetNode("%TabsPanel"); + _tabsPanel = GetNode("%TabsPanel"); GlobalEvents.ProjectStartedDebugging += async projectModel => { await this.InvokeAsync(() => ProjectStartedDebugging(projectModel)); diff --git a/src/SharpIDE.Godot/Features/Debug_/DebugPanel.tscn b/src/SharpIDE.Godot/Features/Debug_/DebugPanel.tscn index 0a6abc6..3937092 100644 --- a/src/SharpIDE.Godot/Features/Debug_/DebugPanel.tscn +++ b/src/SharpIDE.Godot/Features/Debug_/DebugPanel.tscn @@ -62,7 +62,7 @@ tab_close_display_policy = 2 tab_count = 1 tab_0/title = "WebApi" -[node name="TabsPanel" type="Panel" parent="VBoxContainer"] +[node name="TabsPanel" type="MarginContainer" parent="VBoxContainer"] unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 diff --git a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.tscn b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.tscn index e2bf868..38c48e9 100644 --- a/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.tscn +++ b/src/SharpIDE.Godot/Features/Problems/ProblemsPanel.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=5 format=3 uid="uid://tqpmww430cor"] +[gd_scene load_steps=6 format=3 uid="uid://tqpmww430cor"] [ext_resource type="Script" uid="uid://b1r3no4u3khik" path="res://Features/Problems/ProblemsPanel.cs" id="1_bnenc"] [ext_resource type="Texture2D" uid="uid://pd3h5qfjn8pb" path="res://Features/Problems/Resources/Warning.svg" id="2_xj8le"] [ext_resource type="Texture2D" uid="uid://rvuk8jybyu6m" path="res://Features/Problems/Resources/Error.svg" id="3_sap6e"] [ext_resource type="Texture2D" uid="uid://cqt30ma6xgder" path="res://Features/SolutionExplorer/Resources/Csproj.svg" id="4_wqdox"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_wqdox"] + [node name="ProblemsPanel" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -29,4 +31,5 @@ grow_vertical = 2 layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 +theme_override_styles/panel = SubResource("StyleBoxEmpty_wqdox") hide_root = true diff --git a/src/SharpIDE.Godot/Features/Run/RunPanel.cs b/src/SharpIDE.Godot/Features/Run/RunPanel.cs index c572c12..01f3b54 100644 --- a/src/SharpIDE.Godot/Features/Run/RunPanel.cs +++ b/src/SharpIDE.Godot/Features/Run/RunPanel.cs @@ -7,7 +7,7 @@ namespace SharpIDE.Godot.Features.Run; public partial class RunPanel : Control { private TabBar _tabBar = null!; - private Panel _tabsPanel = null!; + private MarginContainer _tabsPanel = null!; [Export] public Texture2D RunningIcon { get; set; } = null!; @@ -20,7 +20,7 @@ public partial class RunPanel : Control _tabBar.ClearTabs(); //_tabBar.TabClosePressed _tabBar.TabClicked += OnTabBarTabClicked; - _tabsPanel = GetNode("%TabsPanel"); + _tabsPanel = GetNode("%TabsPanel"); GlobalEvents.ProjectStartedRunning += async projectModel => { await this.InvokeAsync(() => ProjectStartedRunning(projectModel)); diff --git a/src/SharpIDE.Godot/Features/Run/RunPanel.tscn b/src/SharpIDE.Godot/Features/Run/RunPanel.tscn index 80ffd4b..e665598 100644 --- a/src/SharpIDE.Godot/Features/Run/RunPanel.tscn +++ b/src/SharpIDE.Godot/Features/Run/RunPanel.tscn @@ -62,7 +62,7 @@ tab_close_display_policy = 2 tab_count = 1 tab_0/title = "WebApi" -[node name="TabsPanel" type="Panel" parent="VBoxContainer"] +[node name="TabsPanel" type="MarginContainer" parent="VBoxContainer"] unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 diff --git a/src/SharpIDE.Godot/IdeRoot.tscn b/src/SharpIDE.Godot/IdeRoot.tscn index bd88965..f2b467a 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 = -175 +split_offset = 402 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="MarginContainer" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer"] +[node name="BottomPanel" type="Panel" 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 = 2 +layout_mode = 1 [node name="RunPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("5_y3aoi")] unique_name_in_owner = true -layout_mode = 2 +layout_mode = 1 [node name="DebugPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("11_s2dv6")] unique_name_in_owner = true visible = false -layout_mode = 2 +layout_mode = 1 [node name="BuildPanel" parent="VBoxContainer/HBoxContainer/InvertedVSplitContainer/BottomPanel" instance=ExtResource("9_rllbf")] unique_name_in_owner = true visible = false -layout_mode = 2 +layout_mode = 1 [node name="OpenSolutionDialog" type="FileDialog" parent="."] unique_name_in_owner = true