Skip to content

Commit f7461a8

Browse files
committed
优化 内容显示
1 parent e8bdcaa commit f7461a8

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

KitopiaAvalonia/Controls/ListShow.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<DockPanel Margin="15,0,0,0">
4848
<TextBlock VerticalAlignment="Center" Text="{ReflectionBinding}" />
4949
<Button Name="Button" Width="24" Height="24"
50+
ToolTip.Tip="删除"
5051
HorizontalAlignment="Right"
5152
Command="{Binding $parent[controls:ListShow].DelCommand}"
5253
CommandParameter="{ReflectionBinding}"

KitopiaAvalonia/KitopiaAvalonia.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
2929
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
3030
<DebugType Condition="'$(Configuration)' == 'Release'">none</DebugType>
31-
<Version>0.0.2.042</Version>
31+
<Version>0.0.2.043</Version>
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<AvaloniaResource Include="Assets\FluentSystemIcons-Filled.ttf"/>

KitopiaAvalonia/Pages/SettingPage.axaml.cs

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ namespace KitopiaAvalonia.Pages;
2727

2828
public partial class SettingPage : UserControl
2929
{
30-
private CompositeDisposable disposables = new CompositeDisposable();
3130
private ConfigBase? _configBase;
31+
private CompositeDisposable disposables = new CompositeDisposable();
32+
33+
private StackPanel nowControl;
34+
3235
public SettingPage()
3336
{
3437
InitializeComponent();
@@ -42,13 +45,13 @@ public void ChangeConfig(ConfigBase configBase)
4245
StackPanel.Children.Clear();
4346
LoadConfig();
4447
}
48+
4549
~SettingPage()
4650
{
4751
disposables.Dispose();
4852

4953
}
5054

51-
private StackPanel nowControl;
5255
protected override void OnUnloaded(RoutedEventArgs e)
5356
{
5457
base.OnUnloaded(e);
@@ -57,7 +60,7 @@ protected override void OnUnloaded(RoutedEventArgs e)
5760
nowControl = null;
5861
StackPanel.Children.Clear();
5962
}
60-
63+
6164

6265
private void LoadConfig()
6366
{
@@ -116,6 +119,7 @@ private void LoadConfig()
116119
Value = (double)selectedValue,
117120
Maximum = configField.MaxValue,
118121
Minimum = configField.MinValue,
122+
SimpleNumberFormat = "F0"
119123
};
120124

121125
disposables.Add(
@@ -196,6 +200,25 @@ private void LoadConfig()
196200
}
197201

198202
case ConfigFieldType.浮点数:
203+
var textBox1= new NumberBox()
204+
{
205+
206+
Value = (double)selectedValue,
207+
Maximum = configField.MaxValue,
208+
Minimum = configField.MinValue,
209+
SimpleNumberFormat = "F2"
210+
};
211+
212+
disposables.Add(
213+
textBox1.GetObservable(NumberBox.ValueProperty).Subscribe( (d) =>
214+
{
215+
_configBase.OnConfigChanged(this,fieldInfo.Name,d);
216+
fieldInfo.SetValue(_configBase, d);
217+
ConfigManger.Save(_configBase.Name);
218+
219+
}));
220+
221+
SettingsExpander.Footer = textBox1;
199222
break;
200223
case ConfigFieldType.布尔:
201224
{
@@ -314,10 +337,12 @@ private void ObservableCollectionChange(object? sender, NotifyCollectionChangedE
314337
public class AnonymousDisposable : IDisposable
315338
{
316339
private readonly Action _onDispose;
340+
317341
public AnonymousDisposable(Action onDispose)
318342
{
319343
_onDispose = onDispose;
320344
}
345+
321346
public void Dispose()
322347
{
323348
_onDispose.Invoke();

0 commit comments

Comments
 (0)