diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index ed078e3d1b6..b79db9f053c 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -6,10 +6,10 @@
Foreground="{DynamicResource ThemeForegroundBrush}"
FontSize="{DynamicResource FontSizeNormal}">
-
- Light
- Dark
-
+
+ Light
+ Dark
+
@@ -19,11 +19,11 @@
+
-
@@ -40,4 +40,4 @@
-
\ No newline at end of file
+
diff --git a/samples/ControlCatalog/Pages/CarouselPage.xaml b/samples/ControlCatalog/Pages/CarouselPage.xaml
index b08ff565e32..edd692a57eb 100644
--- a/samples/ControlCatalog/Pages/CarouselPage.xaml
+++ b/samples/ControlCatalog/Pages/CarouselPage.xaml
@@ -24,19 +24,19 @@
Transition
-
- None
- Slide
- Crossfade
-
+
+ None
+ Slide
+ Crossfade
+
Orientation
-
- Horizontal
- Vertical
-
+
+ Horizontal
+ Vertical
+
diff --git a/samples/ControlCatalog/Pages/ComboBoxPage.xaml b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
new file mode 100644
index 00000000000..bbfbd4b4cd6
--- /dev/null
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml
@@ -0,0 +1,41 @@
+
+
+ ComboBox
+ A drop-down list.
+
+
+
+ Inline Items
+ Inline Item 2
+ Inline Item 3
+ Inline Item 4
+
+
+
+
+
+
+ Control Items
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/Pages/DropDownPage.xaml.cs b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
similarity index 53%
rename from samples/ControlCatalog/Pages/DropDownPage.xaml.cs
rename to samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
index 70234bc75d4..3eb6d5b595e 100644
--- a/samples/ControlCatalog/Pages/DropDownPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ComboBoxPage.xaml.cs
@@ -3,9 +3,9 @@
namespace ControlCatalog.Pages
{
- public class DropDownPage : UserControl
+ public class ComboBoxPage : UserControl
{
- public DropDownPage()
+ public ComboBoxPage()
{
this.InitializeComponent();
}
@@ -13,9 +13,9 @@ public DropDownPage()
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
- var fontDropDown = this.Find("fontDropDown");
- fontDropDown.Items = Avalonia.Media.FontFamily.SystemFontFamilies;
- fontDropDown.SelectedIndex = 0;
+ var fontComboBox = this.Find("fontComboBox");
+ fontComboBox.Items = Avalonia.Media.FontFamily.SystemFontFamilies;
+ fontComboBox.SelectedIndex = 0;
}
}
}
diff --git a/samples/ControlCatalog/Pages/DropDownPage.xaml b/samples/ControlCatalog/Pages/DropDownPage.xaml
deleted file mode 100644
index 7673294e46d..00000000000
--- a/samples/ControlCatalog/Pages/DropDownPage.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- DropDown
- A drop-down list.
-
-
-
- Inline Items
- Inline Item 2
- Inline Item 3
- Inline Item 4
-
-
-
-
-
-
- Control Items
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
index 07e55813042..e605a92da0c 100644
--- a/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
+++ b/samples/ControlCatalog/Pages/NumericUpDownPage.xaml
@@ -23,9 +23,9 @@
FormatString:
-
-
+
@@ -33,15 +33,15 @@
-
-
+
+
ButtonSpinnerLocation:
-
CultureInfo:
-
Watermark:
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml b/samples/ControlCatalog/Pages/TabControlPage.xaml
index 01ddc0ddca7..e700146a5be 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml
@@ -88,12 +88,12 @@
HorizontalAlignment="Center"
VerticalAlignment="Center">
Tab Placement:
-
- Left
- Bottom
- Right
- Top
-
+
+ Left
+ Bottom
+ Right
+ Top
+
diff --git a/samples/VirtualizationDemo/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml
index 730b61ed547..1c485eb69c0 100644
--- a/samples/VirtualizationDemo/MainWindow.xaml
+++ b/samples/VirtualizationDemo/MainWindow.xaml
@@ -7,9 +7,9 @@
Margin="16 0 0 0"
MinWidth="150"
Spacing="4">
-
-
Horiz. ScrollBar
-
Vert. ScrollBar
-
-
\ No newline at end of file
+