Skip to content

Commit

Permalink
修复 大量界面错误样式
Browse files Browse the repository at this point in the history 
优化 搜索界面项目展示
  • Loading branch information
@MakesYT
MakesYT committed May 26, 2024
1 parent ba12e2e commit 886a478
Show file tree
Hide file tree
Showing 11 changed files with 141 additions and 124 deletions.
3 changes: 2 additions & 1 deletion KitopiaAvalonia/App.axaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Core.ViewModel.Pages.customScenario;
using Core.ViewModel.Pages.plugin;
using Core.ViewModel.TaskEditor;
using HotAvalonia;
using Kitopia.Services;
using KitopiaAvalonia.Pages;
using KitopiaAvalonia.Services;
Expand All @@ -33,7 +34,7 @@ public partial class App : Application

public override void Initialize()
{
//this.EnableHotReload();
this.EnableHotReload();
AvaloniaXamlLoader.Load(this);
}

Expand Down
22 changes: 22 additions & 0 deletions KitopiaAvalonia/Converter/ControlContentSize.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using Avalonia;
using Avalonia.Data.Converters;

namespace KitopiaAvalonia.Converter;

public class ControlContentSize : IMultiValueConverter
{
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
{
throw new NotImplementedException();
}

public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
{
var control = values[0] as double? ?? 0;
var parent = values[1] as Thickness? ?? new Thickness(0);
return control - parent.Left - parent.Right;
}
}
4 changes: 2 additions & 2 deletions KitopiaAvalonia/KitopiaAvalonia.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<ItemGroup>
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta2"/>
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.0" />
<PackageReference Include="HotAvalonia.Extensions" Version="1.1.0" PrivateAssets="All" />
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1"/>
<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
Expand Down
13 changes: 7 additions & 6 deletions KitopiaAvalonia/Pages/CustomScenariosManagerPage.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,20 @@
<UserControl.Resources>
<converter:ReverseBoolToVisibilityConverter x:Key="reverseBoolToVisibilityConverter" />
</UserControl.Resources>
<StackPanel Margin="42">
<Grid RowDefinitions="Auto,Auto,*" Margin="42">
<TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="情景列表">
<TextBlock.Foreground>
<SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
</TextBlock.Foreground>
</TextBlock>
<StackPanel Orientation="Horizontal">
<StackPanel Grid.Row="1" Orientation="Horizontal">
<Button Content="新建情景" Command="{Binding NewCustomScenariosCommand}" />
</StackPanel>
<ListBox Classes="draggableVirtualizing"
<ListBox Grid.Row="2" Classes="draggableVirtualizing"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
MaxHeight="385"

ItemsSource="{Binding CustomScenarios,Mode=OneWay}"
Margin="0,10,0,0">

<ListBox.ItemContainerTheme>
<ControlTheme TargetType="ListBoxItem">
<Setter Property="Template">
Expand Down Expand Up @@ -118,5 +117,7 @@


</ListBox>
</StackPanel>


</Grid>
</UserControl>
63 changes: 34 additions & 29 deletions KitopiaAvalonia/Pages/HotKeyManagerPage.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,44 @@
<UserControl.Resources>
<converter:HotKeySignNameToStringCtr x:Key="HotKeySignNameToStringCtr" />
</UserControl.Resources>
<StackPanel Margin="42">
<Grid RowDefinitions="Auto,*" Margin="42">
<TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="快捷键列表">
<TextBlock.Foreground>
<SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
</TextBlock.Foreground>
</TextBlock>
<ScrollViewer Grid.Row="1">
<ItemsControl

<ItemsControl
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
MaxHeight="385"
Margin="0,10,0,0" ItemsSource="{Binding Source={x:Static hotkey:HotKeyManager.HotKeys}}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="hotkey:HotKeyModel">
<Border BorderBrush="LightGray" BorderThickness="1" CornerRadius="4">
<StackPanel HorizontalAlignment="Center" Margin="5,0,5,5">
<TextBlock Margin="0,5,0,0" Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Text="{Binding SignName,Converter={StaticResource HotKeySignNameToStringCtr}}" />
<controls1:HotKeyShow Margin="0,5,0,0"
HotKeyModel="{Binding RelativeSource={RelativeSource AncestorType=StackPanel},Path=DataContext}" />
</StackPanel>

</Border>

</DataTemplate>
</ItemsControl.ItemTemplate>
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>

</ItemsControl>


</StackPanel>
Margin="0,10,0,0" ItemsSource="{Binding Source={x:Static hotkey:HotKeyManager.HotKeys}}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="hotkey:HotKeyModel">
<Border BorderBrush="LightGray" BorderThickness="1" CornerRadius="4">
<StackPanel HorizontalAlignment="Center" Margin="5,0,5,5">
<TextBlock Margin="0,5,0,0" Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Text="{Binding SignName,Converter={StaticResource HotKeySignNameToStringCtr}}" />
<controls1:HotKeyShow Margin="0,5,0,0"
HotKeyModel="{Binding RelativeSource={RelativeSource AncestorType=StackPanel},Path=DataContext}" />
</StackPanel>

</Border>

</DataTemplate>
</ItemsControl.ItemTemplate>
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>

<WrapPanel ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto"
ScrollViewer.AllowAutoHide="True">

</WrapPanel>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>

</ItemsControl>
</ScrollViewer>


</Grid>
</UserControl>
51 changes: 21 additions & 30 deletions KitopiaAvalonia/Pages/PluginManagerPage.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,26 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:converter="clr-namespace:Kitopia.Converter"
xmlns:pages="clr-namespace:Core.ViewModel.Pages;assembly=Core"
xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
xmlns:customScenario="clr-namespace:Core.ViewModel.Pages.customScenario;assembly=Core"
xmlns:customScenario1="clr-namespace:Core.SDKs.CustomScenario;assembly=Core"
xmlns:av="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:config="clr-namespace:Core.SDKs.Services.Config;assembly=Core"
xmlns:plugin="clr-namespace:Core.ViewModel.Pages.plugin;assembly=Core"
xmlns:plugin1="clr-namespace:Kitopia.View.Pages.Plugin"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="plugin:PluginManagerPageViewModel"
x:Class="KitopiaAvalonia.Pages.PluginManagerPage">

<UserControl.Resources>
<plugin1:PluginInfoToInfo x:Key="PluginInfoToInfo" />

</UserControl.Resources>
<StackPanel Margin="42">
<Grid RowDefinitions="Auto,*" Margin="42">
<TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="插件列表">
<TextBlock.Foreground>
<SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
</TextBlock.Foreground>
</TextBlock>
<ListBox
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
MaxHeight="385"
ItemsSource="{Binding Items}"
Margin="0,10,0,0">
<ListBox Grid.Row="1"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ItemsSource="{Binding Items}"
Margin="0,10,0,0">
<ListBox.ItemContainerTheme>
<ControlTheme TargetType="ListBoxItem">
<Setter Property="Template">
Expand All @@ -52,17 +44,16 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Button HorizontalAlignment="Stretch" x:Name="Button"
Command="{Binding Path=$parent[ListBox].((plugin:PluginManagerPageViewModel)DataContext).ToPluginSettingPageCommand}"
CommandParameter="{Binding }"
Background="Transparent"
Height="72" Margin="0"
Padding="3">
Command="{Binding Path=$parent[ListBox].((plugin:PluginManagerPageViewModel)DataContext).ToPluginSettingPageCommand}"
CommandParameter="{Binding }"
Background="Transparent"
Height="72" Margin="0"
Padding="3">

<Grid VerticalAlignment="Center"
Width="{Binding Path=$parent.Bounds.Width}" ColumnDefinitions="80,*,*,Auto,Auto">
<Image Grid.Column="0" HorizontalAlignment="Left" Focusable="False" Width="48"
Height="48" Margin="0,0,12,0"
/>
Height="48" Margin="0,0,12,0" />
<StackPanel Grid.Column="1" Margin="5" VerticalAlignment="Center"
HorizontalAlignment="Stretch">
<TextBlock VerticalAlignment="Center" Margin="0" Focusable="False"
Expand All @@ -74,12 +65,12 @@
Text="{Binding Path=.,Converter={StaticResource PluginInfoToInfo }}" />
</StackPanel>
<ScrollViewer IsHitTestVisible="False" Grid.Column="2" Height="60"
VerticalAlignment="Center"
HorizontalScrollBarVisibility="Hidden">
VerticalAlignment="Center"
HorizontalScrollBarVisibility="Hidden">
<TextBlock VerticalAlignment="Center"
MaxWidth="{Binding $parent.Bounds.Width}"
TextWrapping="Wrap"
Text="{Binding Description}" />
MaxWidth="{Binding $parent.Bounds.Width}"
TextWrapping="Wrap"
Text="{Binding Description}" />
</ScrollViewer>

<ToggleSwitch
Expand All @@ -88,8 +79,8 @@
Command="{Binding Path=$parent[ListBox].((plugin:PluginManagerPageViewModel)DataContext).SwitchCommand}"
CommandParameter="{Binding}" />
<controls:SymbolIcon Grid.Column="4" Symbol="ChevronRight" FontSize="20"
IsVisible="{Binding IsEnabled}"
Margin="0,0,10,0" />
IsVisible="{Binding IsEnabled}"
Margin="0,0,10,0" />
</Grid>


Expand All @@ -100,5 +91,5 @@

</ListBox>

</StackPanel>
</Grid>
</UserControl>
36 changes: 14 additions & 22 deletions KitopiaAvalonia/Pages/PluginSettingSelectPage.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,20 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:converter="clr-namespace:Kitopia.Converter"
xmlns:pages="clr-namespace:Core.ViewModel.Pages;assembly=Core"
xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
xmlns:customScenario="clr-namespace:Core.ViewModel.Pages.customScenario;assembly=Core"
xmlns:customScenario1="clr-namespace:Core.SDKs.CustomScenario;assembly=Core"
xmlns:av="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:config="clr-namespace:Core.SDKs.Services.Config;assembly=Core"
xmlns:plugin="clr-namespace:Core.ViewModel.Pages.plugin;assembly=Core"
xmlns:plugin1="clr-namespace:Kitopia.View.Pages.Plugin"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="plugin:PluginSettingViewModel"
x:Class="KitopiaAvalonia.Pages.PluginSettingSelectPage">
<UserControl.Resources>

</UserControl.Resources>
<StackPanel Margin="42">
<Grid RowDefinitions="Auto,*" Margin="42">
<TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="{Binding PluginName}" />
<ListBox
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
MaxHeight="385"
ItemsSource="{Binding SettingItems}"
Margin="0,10,0,0">
<ListBox Grid.Row="1"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
MaxHeight="385"
ItemsSource="{Binding SettingItems}"
Margin="0,10,0,0">
<ListBox.ItemContainerTheme>
<ControlTheme TargetType="ListBoxItem">
<Setter Property="Template">
Expand All @@ -46,17 +38,17 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Button HorizontalAlignment="Stretch" x:Name="Button"
Command="{Binding Path=$parent[ListBox].((plugin:PluginSettingViewModel)DataContext).NavigateCommand}"
CommandParameter="{Binding Key }"
Background="Transparent"
Height="72" Margin="0"
Padding="3">
Command="{Binding Path=$parent[ListBox].((plugin:PluginSettingViewModel)DataContext).NavigateCommand}"
CommandParameter="{Binding Key }"
Background="Transparent"
Height="72" Margin="0"
Padding="3">

<Grid VerticalAlignment="Center"
Width="{Binding Path=$parent.Bounds.Width}" ColumnDefinitions="80,*,*,Auto,Auto">
<TextBlock Grid.Column="1" Text="{Binding Title}" FontSize="18" />
<controls:SymbolIcon Grid.Column="4" Symbol="ChevronRight" FontSize="20"
Margin="0,0,10,0" />
Margin="0,0,10,0" />
</Grid>


Expand All @@ -66,5 +58,5 @@


</ListBox>
</StackPanel>
</Grid>
</UserControl>
13 changes: 5 additions & 8 deletions KitopiaAvalonia/Pages/SettingPage.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,22 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:converter="clr-namespace:Kitopia.Converter"
xmlns:pages="clr-namespace:Core.ViewModel.Pages;assembly=Core"
xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="pages:SettingPageViewModel"
x:Class="KitopiaAvalonia.Pages.SettingPage">
<UserControl.Resources>
<converter:HotKeySignNameToolCTr x:Key="HotKeySignNameToolCTr" />
</UserControl.Resources>
<ScrollViewer>
<StackPanel Margin="42">
<TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Name="TextBlock" />
<StackPanel Name="StackPanel">

<Grid RowDefinitions="Auto,*" Margin="42">
<TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Name="TextBlock" />
<StackPanel Grid.Row="1" Name="StackPanel">


</StackPanel>
</StackPanel>
</Grid>

</ScrollViewer>

</UserControl>
6 changes: 1 addition & 5 deletions KitopiaAvalonia/Windows/MouseQuickWindow.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@
<searchWindow:SymbolToVisible x:Key="SymbolToVisible" />
<converter:IntToIconSymbol x:Key="IntToIconSymbol" />
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid RowDefinitions="Auto,*">
<TextBlock Grid.Row="0" Text="{Binding SelectedItem,Converter={StaticResource MouseQuickSelectedItem}}"
TextWrapping="Wrap" FontSize="20" Margin="10,10,10,10" />

Expand Down
Loading

0 comments on commit 886a478

Please sign in to comment.