Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 72f5f96

Browse files
Hexer10Hexer10
committed
Revert commit 3872d32 
1 parent 3872d32 commit 72f5f96

File tree

6 files changed

+27
-83
lines changed

6 files changed

+27
-83
lines changed

‎UI/Components/EditorElement.xaml‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,10 @@
9393
<Grid>
9494
<ListBox Name="AutoCompleteBox" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="0" Width="0"
9595
Height="175" Background="Transparent" Opacity="1" Foreground="{DynamicResource BlackColorBrush}"
96-
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden">
97-
<ListBox.ItemContainerStyle>
98-
<Style TargetType="{x:Type ListBoxItem}">
99-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
100-
<Setter Property="VerticalContentAlignment" Value="Center"/>
101-
</Style>
102-
</ListBox.ItemContainerStyle>
103-
</ListBox>
96+
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" />
10497
<ListBox Name="MethodAutoCompleteBox" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="0" Width="0"
105-
Height="175" Background="Transparent" Opacity="0" Foreground="{DynamicResource BlackColorBrush}"
106-
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden">
107-
<ListBox.ItemContainerStyle>
108-
<Style TargetType="{x:Type ListBoxItem}">
109-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
110-
<Setter Property="VerticalContentAlignment" Value="Center"/>
111-
</Style>
112-
</ListBox.ItemContainerStyle>
113-
</ListBox>
98+
Height="175" Background="Transparent" Opacity="0" Foreground="{DynamicResource BlackColorBrush}"
99+
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" />
114100
</Grid>
115101
</Border>
116102
</Grid>

‎UI/MainWindow.xaml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
2-
<controls:MetroWindow x:Class="Spedit.UI.MainWindow"
3-
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
4-
xmlns:dock="http://schemas.xceed.com/wpf/xaml/avalondock"
5-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
6-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
7-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
9-
xmlns:stheme="clr-namespace:Spedit.UI.STheme"
10-
mc:Ignorable="d"
11-
Title="Spedit" GlowBrush="{DynamicResource AccentColorBrush}" MinHeight="100" MinWidth="200" KeyDown="MainWindowEvent_KeyDown" Closing="MetroWindow_Closing"
1+
<controls:MetroWindow x:Class="Spedit.UI.MainWindow"
2+
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3+
xmlns:dock="http://schemas.xceed.com/wpf/xaml/avalondock"
4+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8+
xmlns:stheme="clr-namespace:Spedit.UI.STheme"
9+
mc:Ignorable="d"
10+
Title="Spedit" GlowBrush="{DynamicResource AccentColorBrush}" MinHeight="100" MinWidth="200" KeyDown="MainWindowEvent_KeyDown" Closing="MetroWindow_Closing"
1211
AllowDrop="True" Drop="MetroWindow_Drop" ShowIconOnTitleBar="False" TitleCaps="False">
1312
<controls:MetroWindow.Resources>
14-
1513
<ResourceDictionary>
1614
<ResourceDictionary.MergedDictionaries>
1715
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />

‎UI/STheme/STheme.xaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,12 +1463,6 @@
14631463
Background="Transparent"
14641464
BorderThickness="0"
14651465
MaxHeight="400">
1466-
<!--<ListBox.ItemContainerStyle>
1467-
<Style TargetType="{x:Type ListBoxItem}">
1468-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
1469-
<Setter Property="VerticalContentAlignment" Value="Center"/>
1470-
</Style>
1471-
</ListBox.ItemContainerStyle>-->
14721466
<ListBox.ItemTemplate>
14731467
<DataTemplate>
14741468
<Grid>
@@ -1497,12 +1491,6 @@
14971491
Background="Transparent"
14981492
BorderThickness="0"
14991493
MaxHeight="400">
1500-
<!--<ListBox.ItemContainerStyle>
1501-
<Style TargetType="{x:Type ListBoxItem}">
1502-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
1503-
<Setter Property="VerticalContentAlignment" Value="Center"/>
1504-
</Style>
1505-
</ListBox.ItemContainerStyle>-->
15061494
<ListBox.ItemTemplate>
15071495
<DataTemplate>
15081496
<Grid>

‎UI/Windows/ConfigWindow.xaml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,7 @@
1919
<Grid Margin="0,0,0,0">
2020
<Button Name="NewButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0" Width="75" Content="New" Click="NewButton_Clicked" />
2121
<Button Name="DeleteButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="120,5,0,0" Width="75" Content="Delete" Click="DeleteButton_Clicked" />
22-
<ListBox Name="ConfigListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0,35,0,0" Width="200" SelectionChanged="ConfigListBox_SelectionChanged">
23-
<ListBox.ItemContainerStyle>
24-
<Style TargetType="{x:Type ListBoxItem}">
25-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
26-
<Setter Property="VerticalContentAlignment" Value="Center"/>
27-
</Style>
28-
</ListBox.ItemContainerStyle>
29-
</ListBox>
30-
22+
<ListBox Name="ConfigListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0,35,0,0" Width="200" SelectionChanged="ConfigListBox_SelectionChanged" />
3123
<Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="200,30,0,0" Height="5" IsHitTestVisible="False">
3224
<Rectangle.Fill>
3325
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">

‎UI/Windows/NewFileWindow.xaml‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
11
<controls:MetroWindow x:Class="Spedit.UI.Windows.NewFileWindow"
2-
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
Width="800" Height="500" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"
7-
GlowBrush="{DynamicResource AccentColorBrush}"
2+
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
Width="800" Height="500" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}"
87
Title="New" ShowTitleBar="False">
98
<controls:MetroWindow.Resources>
109
<ResourceDictionary>
1110
<ResourceDictionary.MergedDictionaries>
1211
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
1312
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
1413
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
15-
<ResourceDictionary
16-
Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
14+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
1715
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Red.xaml" />
1816
</ResourceDictionary.MergedDictionaries>
1917
</ResourceDictionary>
2018
</controls:MetroWindow.Resources>
2119
<Grid>
22-
<ListBox Name="TemplateListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250"
23-
Margin="0,0,0,50" SelectionChanged="TemplateListBox_SelectionChanged">
24-
<ListBox.ItemContainerStyle>
25-
<Style TargetType="{x:Type ListBoxItem}">
26-
<Setter Property="HorizontalContentAlignment" Value="Left" />
27-
<Setter Property="VerticalContentAlignment" Value="Center" />
28-
</Style>
29-
</ListBox.ItemContainerStyle>
30-
</ListBox>
31-
<TextBlock Name="PreviewBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="260,10,0,0"
32-
Text="Preview:" IsHitTestVisible="False" />
33-
<TextBox Name="PrevieBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="260,30,5,50"
34-
IsReadOnly="True" />
35-
<TextBox Name="PathBox" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,0,120,5"
20+
<ListBox Name="TemplateListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250" Margin="0,0,0,50" SelectionChanged="TemplateListBox_SelectionChanged" />
21+
<TextBlock Name="PreviewBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="260,10,0,0" Text="Preview:" IsHitTestVisible="False" />
22+
<TextBox Name="PrevieBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="260,30,5,50" IsReadOnly="True" />
23+
<TextBox Name="PathBox" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,0,120,5"
3624
Style="{StaticResource SearchMetroTextBox}"
3725
controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonFileCmd, Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
38-
<Button Name="SaveButton" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,5"
39-
Content="Save" Width="100" Click="Button_Click" />
26+
<Button Name="SaveButton" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,5" Content="Save" Width="100" Click="Button_Click" />
4027
</Grid>
41-
</controls:MetroWindow>
28+
</controls:MetroWindow>

‎UI/Windows/SPDefinitionWindow.xaml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@
1919
<Grid>
2020
<TextBox Name="SPSearchBox" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300" TextChanged="TextBox_TextChanged" />
2121
<controls:MetroProgressBar Name="SPProgress" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300" Margin="0,26,0,0" IsIndeterminate="False" IsHitTestVisible="False" Height="4" Foreground="{DynamicResource AccentColorBrush}" Background="{DynamicResource WhiteColorBrush}" />
22-
<ListBox Name="SPBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="300" Margin="1,30,0,5" SelectionChanged="SPFunctionsListBox_SelectionChanged">
23-
<ListBox.ItemContainerStyle>
24-
<Style TargetType="{x:Type ListBoxItem}">
25-
<Setter Property="HorizontalContentAlignment" Value="Left"/>
26-
<Setter Property="VerticalContentAlignment" Value="Center"/>
27-
</Style>
28-
</ListBox.ItemContainerStyle>
29-
</ListBox>
22+
<ListBox Name="SPBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="300" Margin="1,30,0,5" SelectionChanged="SPFunctionsListBox_SelectionChanged" />
3023
<TextBlock Name="SPNameBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="305,15,0,0" FontSize="20" Foreground="{DynamicResource AccentColorBrush}" IsHitTestVisible="False" />
3124
<TextBlock Name="SPFullNameBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="305,45,0,0" FontSize="18" IsHitTestVisible="False" />
3225
<TextBlock Name="SPFileBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="305,75,0,0" FontSize="16" IsHitTestVisible="False" Foreground="Gray" />

0 commit comments

Comments
 (0)