diff options
| -rw-r--r-- | Scripts/InputContainer.cs | 7 | ||||
| -rw-r--r-- | Scripts/OutputContainer.cs | 3 | ||||
| -rw-r--r-- | Scripts/OutputRow.cs | 7 | ||||
| -rw-r--r-- | Scripts/StartMenu.cs | 20 | ||||
| -rw-r--r-- | Texty.csproj | 14 | ||||
| -rw-r--r-- | Texty.sln.DotSettings | 2 | ||||
| -rw-r--r-- | addons/ClassExporter/Plugin.cs | 2 |
7 files changed, 23 insertions, 32 deletions
diff --git a/Scripts/InputContainer.cs b/Scripts/InputContainer.cs index 8e8ef90..300d568 100644 --- a/Scripts/InputContainer.cs +++ b/Scripts/InputContainer.cs @@ -4,8 +4,7 @@ namespace Texty.Scripts { public abstract class InputContainer : HBoxContainer { - [Signal] - public delegate void InputSubmitted(string text); + [Signal] public delegate void InputSubmitted(string text); public LineEdit InputField; public Button SubmitButton; @@ -36,13 +35,9 @@ namespace Texty.Scripts public void OnVisibilityChanged() { if (Visible) - { InputField.GrabFocus(); - } else - { InputField.ReleaseFocus(); - } } private void SubmitText(string newText) diff --git a/Scripts/OutputContainer.cs b/Scripts/OutputContainer.cs index d5a5bea..5db1fe6 100644 --- a/Scripts/OutputContainer.cs +++ b/Scripts/OutputContainer.cs @@ -9,8 +9,7 @@ namespace Texty.Scripts private VScrollBar _scrollBar; - [Export(PropertyHint.Range, "10,40,1")] - public int MaximumRows = 20; + [Export(PropertyHint.Range, "10,40,1")] public int MaximumRows = 20; public VBoxContainer OutputRows; public ScrollContainer ScrollContainer; diff --git a/Scripts/OutputRow.cs b/Scripts/OutputRow.cs index 13d9293..cfbb2e7 100644 --- a/Scripts/OutputRow.cs +++ b/Scripts/OutputRow.cs @@ -5,11 +5,8 @@ namespace Texty.Scripts { public abstract class OutputRow : VBoxContainer { - [Signal] - public delegate void InputTextChanged(string newText); - - [Signal] - public delegate void OutputTextChanged(string newText); + [Signal] public delegate void InputTextChanged(string newText); + [Signal] public delegate void OutputTextChanged(string newText); private string _inputText = ""; private string _outputText = ""; diff --git a/Scripts/StartMenu.cs b/Scripts/StartMenu.cs index 8efa22d..70b84b2 100644 --- a/Scripts/StartMenu.cs +++ b/Scripts/StartMenu.cs @@ -8,14 +8,12 @@ namespace Texty.Scripts public Button QuitButton; public Button StartButton; - public override void _Ready() - { - var buttons = FindNode("Buttons"); - CreditsButton = buttons.GetNode<Button>(nameof(CreditsButton)); - QuitButton = buttons.GetNode<Button>(nameof(QuitButton)); - StartButton = buttons.GetNode<Button>(nameof(StartButton)); - } - - } -} - + public override void _Ready() + { + var buttons = FindNode("Buttons"); + CreditsButton = buttons.GetNode<Button>(nameof(CreditsButton)); + QuitButton = buttons.GetNode<Button>(nameof(QuitButton)); + StartButton = buttons.GetNode<Button>(nameof(StartButton)); + } + } +}
\ No newline at end of file diff --git a/Texty.csproj b/Texty.csproj index b77cca4..1891fdd 100644 --- a/Texty.csproj +++ b/Texty.csproj @@ -8,16 +8,16 @@ <NeutralLanguage>en-US</NeutralLanguage> </PropertyGroup> <ItemGroup> - <Compile Remove="ScriptTemplates\**" /> - <Compile Remove="Scenes\**" /> - <Compile Remove="Tests\**" /> + <Compile Remove="ScriptTemplates\**"/> + <Compile Remove="Scenes\**"/> + <Compile Remove="Tests\**"/> </ItemGroup> <ItemGroup> - <EmbeddedResource Remove="ScriptTemplates\**" /> - <EmbeddedResource Remove="Scenes\**" /> - <EmbeddedResource Remove="Tests\**" /> + <EmbeddedResource Remove="ScriptTemplates\**"/> + <EmbeddedResource Remove="Scenes\**"/> + <EmbeddedResource Remove="Tests\**"/> </ItemGroup> <ItemGroup> - <Content Include="addons\ClassExporter\plugin.cfg" /> + <Content Include="addons\ClassExporter\plugin.cfg"/> </ItemGroup> </Project>
\ No newline at end of file diff --git a/Texty.sln.DotSettings b/Texty.sln.DotSettings index 2bd83cb..17e9596 100644 --- a/Texty.sln.DotSettings +++ b/Texty.sln.DotSettings @@ -1,2 +1,4 @@ <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> + <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_METHOD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">IF_OWNER_IS_SINGLE_LINE</s:String> + <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_TYPE_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">IF_OWNER_IS_SINGLE_LINE</s:String> <s:Boolean x:Key="/Default/UserDictionary/Words/=Texty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file diff --git a/addons/ClassExporter/Plugin.cs b/addons/ClassExporter/Plugin.cs index e945f63..2358e42 100644 --- a/addons/ClassExporter/Plugin.cs +++ b/addons/ClassExporter/Plugin.cs @@ -32,7 +32,7 @@ namespace Texty.addons.ClassExporter { DeRegisterTypes(); } - + public override void _ExitTree() { DeRegisterTypes(); |