demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml

@@ -27,15 +27,6 @@
         <ComboBox Classes="Small" />
         <ComboBox Classes="Bordered" />
         <ComboBox Classes="Bordered" IsEnabled="False" />
-        <ComboBox>
-          <ComboBox.SelectionBoxItemTemplate>
-            <DataTemplate DataType="x:String">
-              <ContentControl BorderThickness="1"
-                              BorderBrush="Gold"
-                              Content="{Binding}" />
-            </DataTemplate>
-          </ComboBox.SelectionBoxItemTemplate>
-        </ComboBox>
 
         <StackPanel Orientation="Horizontal">
             <ComboBox Width="100" Classes="Large" PlaceholderText="Large" />

demo/Semi.Avalonia.Demo/Themes/ToggleSwitch.axaml

@@ -3,13 +3,11 @@
                   BasedOn="{StaticResource ButtonToggleSwitch}"
                   TargetType="ToggleSwitch">
         <Setter Property="Padding" Value="8" />
-        <Setter Property="OnContent" Value="{Binding $self.Content}" />
         <Setter Property="OnContentTemplate">
             <DataTemplate>
                 <PathIcon Theme="{StaticResource InnerPathIcon}" Data="{Binding}" />
             </DataTemplate>
         </Setter>
-        <Setter Property="OffContent" Value="{Binding $self.Content}" />
         <Setter Property="OffContentTemplate">
             <DataTemplate>
                 <PathIcon Theme="{StaticResource InnerPathIcon}" Data="{Binding}" />

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -27,25 +27,28 @@
                             Watermark="{TemplateBinding Watermark}" />
                         <Popup
                             Name="PART_Popup"
+                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                             MaxHeight="{TemplateBinding MaxDropDownHeight}"
                             IsLightDismissEnabled="True"
                             PlacementTarget="{TemplateBinding}">
                             <Border
-                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                                 Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
-                                Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource AutoCompleteBoxPopupBackground}"
                                 BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
                                 BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
                                 CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-                                <ListBox
+                                <Border
-                                    Name="PART_SelectingItemsControl"
+                                    CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}"
-                                    Foreground="{TemplateBinding Foreground}"
+                                    ClipToBounds="True">
-                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                    <ListBox
-                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                        Name="PART_SelectingItemsControl"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                                        Foreground="{TemplateBinding Foreground}"
+                                        ItemTemplate="{TemplateBinding ItemTemplate}"
+                                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                        ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                                </Border>
                             </Border>
                         </Popup>
                     </Panel>
@@ -66,25 +69,28 @@
                             Watermark="{TemplateBinding Watermark}" />
                         <Popup
                             Name="PART_Popup"
+                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                             MaxHeight="{TemplateBinding MaxDropDownHeight}"
                             IsLightDismissEnabled="True"
                             PlacementTarget="{TemplateBinding}">
                             <Border
-                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                                 Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
-                                Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
                                 HorizontalAlignment="Stretch"
                                 Background="{DynamicResource AutoCompleteBoxPopupBackground}"
                                 BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
                                 BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
                                 CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
+                                <Border
+                                    CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}"
+                                    ClipToBounds="True">
                                     <ListBox
                                         Name="PART_SelectingItemsControl"
                                         Foreground="{TemplateBinding Foreground}"
                                         ItemTemplate="{TemplateBinding ItemTemplate}"
                                         ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                         ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                                </Border>
                             </Border>
                         </Popup>
                     </Panel>

src/Semi.Avalonia/Controls/Calendar.axaml

@@ -95,8 +95,7 @@
                             Name="PART_MonthView"
                             Grid.Row="1"
                             HorizontalAlignment="Stretch"
-                            IsVisible="False"
+                            IsVisible="False">
-                            ColumnDefinitions="*,*,*,*,*,*,*">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="{DynamicResource CalendarItemWeekDayNameHeight}" />
                                 <RowDefinition Height="*" />
@@ -106,14 +105,33 @@
                                 <RowDefinition Height="*" />
                                 <RowDefinition Height="*" />
                             </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
                         </Grid>
                         <Grid
                             Name="PART_YearView"
                             Grid.Row="1"
                             Background="{TemplateBinding Background}"
-                            IsVisible="False"
+                            IsVisible="False">
-                            ColumnDefinitions="*,*,*,*"
+                            <Grid.RowDefinitions>
-                            RowDefinitions="*,*,*" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                        </Grid>
                     </Grid>
                 </Border>
             </ControlTemplate>
@@ -133,7 +151,6 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CalendarButton">
                 <ContentControl
@@ -194,7 +211,6 @@
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="CalendarDayButton">
                 <ContentControl

src/Semi.Avalonia/Controls/CalendarDatePicker.axaml

@@ -3,8 +3,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
     <Design.PreviewWith>
-        <StackPanel Margin="20" Width="800" Height="400">
+        <StackPanel Margin="20" Width="300" Height="400">
-            <CalendarDatePicker HorizontalAlignment="Center" Classes="ClearButton" />
+            <CalendarDatePicker Classes="ClearButton" />
         </StackPanel>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
@@ -96,22 +96,25 @@
                             <Popup
                                 Name="PART_Popup"
                                 Grid.Column="0"
+                                HorizontalOffset="-8"
                                 IsLightDismissEnabled="True"
-                                Placement="BottomEdgeAlignedLeft"
+                                PlacementTarget="{TemplateBinding}"
-                                PlacementTarget="{TemplateBinding}">
+                                VerticalOffset="-4">
                                 <Border
-                                    Margin="4"
+                                    Margin="8"
+                                    Background="Transparent"
                                     BoxShadow="{DynamicResource CalendarDatePickerPopupBoxShadows}"
                                     CornerRadius="{DynamicResource CalendarCornerRadius}">
                                     <Calendar
                                         Name="PART_Calendar"
-                                        BorderThickness="0"
+                                        CornerRadius="{Binding $parent[Border].CornerRadius}"
                                         DisplayDate="{TemplateBinding DisplayDate}"
                                         DisplayDateEnd="{TemplateBinding DisplayDateEnd}"
                                         DisplayDateStart="{TemplateBinding DisplayDateStart}"
                                         FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
                                         IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                                        SelectedDate="{TemplateBinding SelectedDate, Mode=TwoWay}" />
+                                        SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate, Mode=TwoWay}">
+                                    </Calendar>
                                 </Border>
                             </Popup>
                         </Grid>

src/Semi.Avalonia/Controls/ComboBox.axaml

@@ -76,7 +76,7 @@
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             Content="{TemplateBinding SelectionBoxItem}"
-                            ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" />
+                            ContentTemplate="{TemplateBinding ItemTemplate}" />
                         <Button
                             Name="ClearButton"
                             Grid.Column="1"
@@ -100,7 +100,9 @@
                         <Popup
                             Name="PART_Popup"
                             Grid.Column="0"
+                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                             MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                            ClipToBounds="False"
                             InheritsTransform="True"
                             IsLightDismissEnabled="True"
                             IsOpen="{TemplateBinding IsDropDownOpen, Mode=TwoWay}"
@@ -109,22 +111,24 @@
                             <Border
                                 Name="PopupBorder"
                                 HorizontalAlignment="Stretch"
-                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                                 Margin="{DynamicResource ComboBoxPopupBorderMargin}"
-                                Padding="{DynamicResource ComboBoxPopupBorderPadding}"
                                 Background="{DynamicResource ComboBoxPopupBackground}"
                                 BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
                                 BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
                                 BoxShadow="{DynamicResource ComboBoxPopupBoxShadow}"
                                 CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}">
-                                <ScrollViewer
+                                <Border
-                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                    CornerRadius="{DynamicResource ComboBoxPopupBoxCornerRadius}"
-                                    IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                    ClipToBounds="True">
-                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                    <ScrollViewer
-                                    <ItemsPresenter
+                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                        Name="PART_ItemsPresenter"
+                                        IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
-                                        ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                                </ScrollViewer>
+                                        <ItemsPresenter
+                                            Name="PART_ItemsPresenter"
+                                            ItemsPanel="{TemplateBinding ItemsPanel}" />
+                                    </ScrollViewer>
+                                </Border>
                             </Border>
                         </Popup>
                     </Grid>

src/Semi.Avalonia/Controls/Menu.axaml

@@ -10,77 +10,81 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ScrollViewer">
-                <DockPanel>
+                <Border 
-                    <DockPanel.Styles>
+                    ClipToBounds="True"
-                        <Style Selector="RepeatButton:pressed">
+                    CornerRadius="{TemplateBinding CornerRadius}">
-                            <Setter Property="RenderTransform" Value="{x:Null}" />
+                    <DockPanel>
-                        </Style>
+                        <DockPanel.Styles>
-                    </DockPanel.Styles>
+                            <Style Selector="RepeatButton:pressed">
-                    <RepeatButton
+                                <Setter Property="RenderTransform" Value="{x:Null}" />
-                        HorizontalAlignment="Stretch"
+                            </Style>
-                        HorizontalContentAlignment="Center"
+                        </DockPanel.Styles>
-                        Background="Transparent"
+                        <RepeatButton
-                        BorderThickness="0"
+                            HorizontalAlignment="Stretch"
-                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
+                            HorizontalContentAlignment="Center"
-                        CornerRadius="0"
+                            Background="Transparent"
-                        DockPanel.Dock="Top"
+                            BorderThickness="0"
-                        RenderTransform="{x:Null}">
+                            Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
-                        <RepeatButton.IsVisible>
+                            CornerRadius="0"
-                            <MultiBinding
+                            DockPanel.Dock="Top"
-                                Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            RenderTransform="{x:Null}">
-                                ConverterParameter="0">
+                            <RepeatButton.IsVisible>
-                                <Binding Path="VerticalScrollBarVisibility"
+                                <MultiBinding
-                                         RelativeSource="{RelativeSource TemplatedParent}" />
+                                    Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    ConverterParameter="0">
-                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="VerticalScrollBarVisibility"
-                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                             RelativeSource="{RelativeSource TemplatedParent}" />
-                            </MultiBinding>
+                                    <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                        </RepeatButton.IsVisible>
+                                    <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                        <PathIcon
+                                    <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                            Theme="{DynamicResource InnerPathIcon}"
+                                </MultiBinding>
-                            Data="{DynamicResource MenuScrollViewerUpButtonGlyph}"
+                            </RepeatButton.IsVisible>
-                            Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
+                            <PathIcon
-                    </RepeatButton>
+                                Theme="{DynamicResource InnerPathIcon}"
-                    <RepeatButton
+                                Data="{DynamicResource MenuScrollViewerUpButtonGlyph}"
-                        HorizontalAlignment="Stretch"
+                                Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
-                        HorizontalContentAlignment="Center"
+                        </RepeatButton>
-                        Background="Transparent"
+                        <RepeatButton
-                        BorderThickness="0"
+                            HorizontalAlignment="Stretch"
-                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
+                            HorizontalContentAlignment="Center"
-                        CornerRadius="0"
+                            Background="Transparent"
-                        DockPanel.Dock="Bottom"
+                            BorderThickness="0"
-                        RenderTransform="{x:Null}">
+                            Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
-                        <RepeatButton.IsVisible>
+                            CornerRadius="0"
-                            <MultiBinding
+                            DockPanel.Dock="Bottom"
-                                Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
+                            RenderTransform="{x:Null}">
-                                ConverterParameter="100">
+                            <RepeatButton.IsVisible>
-                                <Binding Path="VerticalScrollBarVisibility"
+                                <MultiBinding
-                                         RelativeSource="{RelativeSource TemplatedParent}" />
+                                    Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    ConverterParameter="100">
-                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="VerticalScrollBarVisibility"
-                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                             RelativeSource="{RelativeSource TemplatedParent}" />
-                            </MultiBinding>
+                                    <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                        </RepeatButton.IsVisible>
+                                    <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                        <PathIcon
+                                    <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                            Theme="{DynamicResource InnerPathIcon}"
+                                </MultiBinding>
-                            Data="{DynamicResource MenuScrollViewerDownButtonGlyph}"
+                            </RepeatButton.IsVisible>
-                            Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
+                            <PathIcon
-                    </RepeatButton>
+                                Theme="{DynamicResource InnerPathIcon}"
-                    <ScrollContentPresenter
+                                Data="{DynamicResource MenuScrollViewerDownButtonGlyph}"
-                        Name="PART_ContentPresenter"
+                                Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
-                        Margin="{TemplateBinding Padding}"
+                        </RepeatButton>
-                        HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
+                        <ScrollContentPresenter
-                        HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
+                            Name="PART_ContentPresenter"
-                        VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
+                            Margin="{TemplateBinding Padding}"
-                        VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}">
+                            HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
-                        <ScrollContentPresenter.GestureRecognizers>
+                            HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
-                            <ScrollGestureRecognizer
+                            VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
-                                CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
+                            VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}">
-                                CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
+                            <ScrollContentPresenter.GestureRecognizers>
-                                IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <ScrollGestureRecognizer
-                        </ScrollContentPresenter.GestureRecognizers>
+                                    CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
-                    </ScrollContentPresenter>
+                                    CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
-                </DockPanel>
+                                    IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </ScrollContentPresenter.GestureRecognizers>
+                        </ScrollContentPresenter>
+                    </DockPanel>
+                </Border>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
@@ -109,6 +113,7 @@
     <ControlTheme x:Key="{x:Type MenuItem}" TargetType="MenuItem">
         <Setter Property="Background" Value="{DynamicResource MenuItemBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource MenuItemForeground}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource MenuItemCornerRadius}" />
         <Setter Property="Cursor" Value="Hand" />
         <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
         <Setter Property="Padding" Value="{DynamicResource MenuItemPadding}" />

src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml

@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
     <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
-    <Thickness x:Key="AutoCompleteBoxPopupPadding">0 4</Thickness>
     <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
     <x:Double x:Key="AutoCompleteBoxDefaultHeight">32</x:Double>
     <x:Double x:Key="AutoCompleteBoxSmallHeight">24</x:Double>

src/Semi.Avalonia/Themes/Shared/ComboBox.axaml

@@ -14,7 +14,6 @@
         M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z
     </StreamGeometry>
     <Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
-    <Thickness x:Key="ComboBoxPopupBorderPadding">0 4</Thickness>
 
     <x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
     <x:Double x:Key="ComboBoxSmallHeight">24</x:Double>

src/Semi.Avalonia/Themes/Shared/ListBox.axaml

@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- ListBox -->
     <Thickness x:Key="ListBoxItemDefaultPadding">12 8</Thickness>
-    <CornerRadius x:Key="ListBoxItemCornerRadius">0</CornerRadius>
+    <CornerRadius x:Key="ListBoxItemCornerRadius">3</CornerRadius>
 
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/Menu.axaml

@@ -6,7 +6,7 @@
 
     <!--  MenuFlyout  -->
     <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
-    <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
+    <Thickness x:Key="MenuFlyoutPadding">0</Thickness>
     <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
     <x:Double x:Key="MenuFlyoutMinHeight">16</x:Double>
     <x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>