Skip to content

Commit a57e017

Browse files
committedJul 18, 2018
Use ICSharpCode.TextEditor via submodule
This submodule is cloned from the gitextensions team. It includes a fix so that scroll bars are only displayed when there is actually something to scroll.
1 parent 69f1f76 commit a57e017

File tree

6 files changed

+27
-6
lines changed

6 files changed

+27
-6
lines changed
 

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
[submodule "Externals/conemu-inside"]
1111
path = Externals/conemu-inside
1212
url = https://github.com/gitextensions/conemu-inside.git
13+
[submodule "Externals/ICSharpCode.TextEditor"]
14+
path = Externals/ICSharpCode.TextEditor
15+
url = https://github.com/gitextensions/ICSharpCode.TextEditor.git

‎Bin/ICSharpCode.TextEditor.dll

-348 KB
Binary file not shown.

‎Externals/ICSharpCode.TextEditor

Submodule ICSharpCode.TextEditor added at 0e62061

‎GitExtensions.sln

+15
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{17FD2A
180180
EndProject
181181
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtUtilsTests", "UnitTests\GitExtUtils\GitExtUtilsTests.csproj", "{2B9B62FA-3E0C-45C5-9287-68B69413C5DF}"
182182
EndProject
183+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Externals\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
184+
EndProject
183185
Global
184186
GlobalSection(SolutionConfigurationPlatforms) = preSolution
185187
Debug|Any CPU = Debug|Any CPU
@@ -690,6 +692,18 @@ Global
690692
{2B9B62FA-3E0C-45C5-9287-68B69413C5DF}.ReleaseTC|Any CPU.Build.0 = Release|Any CPU
691693
{2B9B62FA-3E0C-45C5-9287-68B69413C5DF}.ReleaseTC|Mixed Platforms.ActiveCfg = Release|Any CPU
692694
{2B9B62FA-3E0C-45C5-9287-68B69413C5DF}.ReleaseTC|Mixed Platforms.Build.0 = Release|Any CPU
695+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
696+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
697+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
698+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
699+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
700+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
701+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
702+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
703+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.ReleaseTC|Any CPU.ActiveCfg = Release|Any CPU
704+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.ReleaseTC|Any CPU.Build.0 = Release|Any CPU
705+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.ReleaseTC|Mixed Platforms.ActiveCfg = Release|Any CPU
706+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.ReleaseTC|Mixed Platforms.Build.0 = Release|Any CPU
693707
EndGlobalSection
694708
GlobalSection(SolutionProperties) = preSolution
695709
HideSolutionNode = FALSE
@@ -734,6 +748,7 @@ Global
734748
{472B72D9-9336-4C8B-A199-300F0CA7669E} = {C5855184-8571-4AD0-A373-B98215BA56CA}
735749
{17FD2A6B-4005-41DC-BFAC-59F936DF33AA} = {C5855184-8571-4AD0-A373-B98215BA56CA}
736750
{2B9B62FA-3E0C-45C5-9287-68B69413C5DF} = {020F800B-9170-4BB3-83C9-FCF83596D83C}
751+
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {0E859634-B3DF-46AC-A73C-D49734F19D6A}
737752
EndGlobalSection
738753
GlobalSection(ExtensibilityGlobals) = postSolution
739754
SolutionGuid = {ECECB7EA-BCCF-44AD-B63E-C2FA45589FB0}

‎GitUI/GitUI.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
<DocumentationFile>bin\Release\GitUI.xml</DocumentationFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="ICSharpCode.TextEditor">
45-
<HintPath>..\Bin\ICSharpCode.TextEditor.dll</HintPath>
46-
</Reference>
4744
<Reference Include="Microsoft.CSharp" />
4845
<Reference Include="Microsoft.WindowsAPICodePack">
4946
<HintPath>..\Bin\Microsoft.WindowsAPICodePack.dll</HintPath>
@@ -1646,6 +1643,10 @@
16461643
<Project>{f50b1dbf-1c9f-4437-87ec-7aba805cc446}</Project>
16471644
<Name>Git.hub</Name>
16481645
</ProjectReference>
1646+
<ProjectReference Include="..\Externals\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
1647+
<Project>{2d18be89-d210-49eb-a9dd-2246fbb3df6d}</Project>
1648+
<Name>ICSharpCode.TextEditor</Name>
1649+
</ProjectReference>
16491650
<ProjectReference Include="..\GitCommands\GitCommands.csproj">
16501651
<Project>{BD6AA2A2-997D-4AFF-ACC7-B64F6E51D181}</Project>
16511652
<Name>GitCommands</Name>

‎UnitTests/GitUITests/GitUITests.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<DocumentationFile>bin\Release\GitUITests.xml</DocumentationFile>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="ICSharpCode.TextEditor">
40-
<HintPath>..\..\Bin\ICSharpCode.TextEditor.dll</HintPath>
41-
</Reference>
4239
<Reference Include="System" />
4340
<Reference Include="System.Drawing" />
4441
<Reference Include="System.Windows.Forms" />
@@ -103,6 +100,10 @@
103100
<Project>{1DC7D403-484B-43B4-B017-1356397A32CB}</Project>
104101
<Name>ConEmuWinForms</Name>
105102
</ProjectReference>
103+
<ProjectReference Include="..\..\Externals\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
104+
<Project>{2d18be89-d210-49eb-a9dd-2246fbb3df6d}</Project>
105+
<Name>ICSharpCode.TextEditor</Name>
106+
</ProjectReference>
106107
<ProjectReference Include="..\..\GitCommands\GitCommands.csproj">
107108
<Project>{BD6AA2A2-997D-4AFF-ACC7-B64F6E51D181}</Project>
108109
<Name>GitCommands</Name>

0 commit comments

Comments
 (0)
Please sign in to comment.