From b9a8bd3a2e80c8771a192d0f45cdff8e43c04be9 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sat, 28 Jan 2023 23:54:48 +0800 Subject: [PATCH] feat: move some resources to shared, update several pseudoclass style. --- .../Pages/TimePickerDemo.axaml | 4 +- .../Controls/DateTimePickerShared.axaml | 24 +++--- src/Semi.Avalonia/Controls/TimePicker.axaml | 76 +++++++++---------- .../Themes/Light/DateTimePickerShared.axaml | 36 +++++++-- .../Themes/Light/TimePicker.axaml | 12 +-- 5 files changed, 87 insertions(+), 65 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml index 566f133..b97b5b5 100644 --- a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml @@ -9,6 +9,8 @@ mc:Ignorable="d"> - @@ -257,23 +258,18 @@ PlacementMode="Bottom" PlacementTarget="{TemplateBinding}" WindowManagerAddShadowHint="False"> - + - - - - diff --git a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml index 274acc3..2deaece 100644 --- a/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml +++ b/src/Semi.Avalonia/Themes/Light/DateTimePickerShared.axaml @@ -1,14 +1,17 @@ - + 0 3 0 6 - - - + + + - - - + + + M6.45096 8.34102L11.247 2.86102C11.3408 2.75361 11.4566 2.66753 11.5865 2.60854C11.7163 2.54956 11.8573 2.51904 12 2.51904C12.1426 2.51904 12.2836 2.54956 12.4135 2.60854C12.5433 2.66753 12.6591 2.75361 12.753 2.86102L17.549 8.34102C18.115 8.98802 17.655 10 16.796 10H7.20396C6.34396 10 5.88496 8.98802 6.45096 8.34102Z M17.549 15.659L12.753 21.139C12.6591 21.2464 12.5434 21.3325 12.4135 21.3915C12.2836 21.4505 12.1427 21.481 12 21.481C11.8574 21.481 11.7164 21.4505 11.5865 21.3915C11.4566 21.3325 11.3409 21.2464 11.247 21.139L6.45101 15.659C5.88501 15.011 6.34501 14 7.20401 14H16.796C17.656 14 18.115 15.012 17.549 15.659Z @@ -17,4 +20,23 @@ + 28 + + + + + + + + + + + + + + + 0 0 8 0 #1A000000 + 16 0 + 8 + diff --git a/src/Semi.Avalonia/Themes/Light/TimePicker.axaml b/src/Semi.Avalonia/Themes/Light/TimePicker.axaml index e808fbc..9df9b0b 100644 --- a/src/Semi.Avalonia/Themes/Light/TimePicker.axaml +++ b/src/Semi.Avalonia/Themes/Light/TimePicker.axaml @@ -1,8 +1,10 @@ - + - - - + M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM13.5 6.5V11.3787L17.0607 14.9393C17.6464 15.5251 17.6464 16.4749 17.0607 17.0607C16.4749 17.6464 15.5251 17.6464 14.9393 17.0607L10.9393 13.0607C10.658 12.7794 10.5 12.3978 10.5 12V6.5C10.5 5.67157 11.1716 5 12 5C12.8284 5 13.5 5.67157 13.5 6.5Z - + +