ICSharpCode
/
AvaloniaILSpy
зеркало из https://github.com/icsharpcode/AvaloniaILSpy.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix button styles

This commit is contained in:
Jeffrey Ye 2018-09-01 11:45:53 -07:00
Родитель 692e90f59e
Коммит 9226a01123
4 изменённых файлов: 16 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
ILSpy.Avalonia.Core/App.xaml
Просмотреть файл

@ -24,8 +24,10 @@
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Width" Value="20" />
<Setter Property="Height" Value="20" />
<Setter Property="Width" Value="20" />
<Setter Property="Height" Value="20" />
<Setter Property="MinWidth" Value="20" />
<Setter Property="MinHeight" Value="20" />
</Style>
<Style Selector="Button.ToolBarItem:pointover /template/ ContentPresenter" >

16
ILSpy.Avalonia.Core/Controls/DockedPane.xaml
Просмотреть файл

@ -42,20 +42,20 @@
<controls:ControlColor Color="243" />
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="0.5"/>
<GradientStop Offset="0">
<GradientStop Offset="0.5">
<GradientStop.Color>
<controls:ControlColor Color="235" />
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="0.5"/>
<GradientStop Offset="0">
<GradientStop Offset="0.5">
<GradientStop.Color>
<controls:ControlColor Color="221" />
</GradientStop.Color>
</GradientStop>
<GradientStop Offset="1"/>
<GradientStop Offset="0">
<GradientStop Offset="1">
<GradientStop.Color>
<controls:ControlColor Color="205" />
</GradientStop.Color>
@ -143,8 +143,8 @@
</Grid.ColumnDefinitions>
<TextBlock Text="{TemplateBinding Title}" Margin="3,0"
Foreground="{x:Static avalonia:SystemColors.InactiveCaptionTextBrush}" VerticalAlignment="Center"/>
<Button x:Name="PART_Close" Grid.Column="2" VerticalAlignment="Center" Width="16" Height="16" DockPanel.Dock="Right" Classes="CloseButtonStyle" ToolTip.Tip="Close" Margin="1">
<Path x:Name="Path" Stretch="Fill" StrokeThickness="0.5" Stroke="#FF333333" Fill="#FF969696" Data="F1 M 0,1.3333L 1.33333,0L 4,2.6666L 6.6666,0 8,1.3333L 5.3333,4L 8,6.6666L 6.6666,8L 4,5.3333L 1.3333,8L 0,6.6666L 2.6666,4L 0,1.3333 Z " HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
<Button x:Name="PART_Close" Grid.Column="2" VerticalAlignment="Center" MinWidth="20" MinHeight="20" Width="20" Height="20" DockPanel.Dock="Right" Classes="CloseButtonStyle" ToolTip.Tip="Close" Margin="1">
<Path x:Name="Path" Width="16" Height="16" Stretch="Fill" StrokeThickness="0.5" Stroke="#FF333333" Fill="#FF969696" Data="F1 M 0,1.3333L 1.33333,0L 4,2.6666L 6.6666,0 8,1.3333L 5.3333,4L 8,6.6666L 6.6666,8L 4,5.3333L 1.3333,8L 0,6.6666L 2.6666,4L 0,1.3333 Z " HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
</Button>
</Grid>
</Border>

6
ILSpy.Avalonia.Core/MainWindow.xaml
Просмотреть файл

@ -27,11 +27,11 @@
</Menu>
<!-- ToolBar -->
<ListBox
Name="toolBar" BorderThickness="0" Padding="2" Classes="ToolBar"
Name="toolBar" BorderThickness="0" Padding="2"
DockPanel.Dock="Top" >
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" Spacing="1" />
<StackPanel Orientation="Horizontal" Spacing="4" />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<!--
@ -54,7 +54,7 @@
BorderThickness="1"
Items="{x:Static local:Languages.AllLanguages}"
SelectedItem="{Binding FilterSettings.Language}"/>
<DropDown Name="languageVersionComboBox" Width="100"
<DropDown Name="languageVersionComboBox" Width="160"
BorderThickness="1"
IsVisible="{Binding SelectedItem.HasLanguageVersions, ElementName=languageComboBox}"
Items="{Binding SelectedItem.LanguageVersions, ElementName=languageComboBox}"

2
ILSpy.Avalonia.Core/Search/SearchPane.xaml.cs
Просмотреть файл

@ -60,7 +60,7 @@ namespace ICSharpCode.ILSpy.Search
private SearchPane()
{
InitializeComponent();
var items = new[] {
searchModeComboBox.Items = new[] {
new { Image = Images.Library, Name = "Types and Members" },
new { Image = Images.Class, Name = "Type" },
new { Image = Images.Property, Name = "Member" },