Browse Source

removed popup from control catalog

pull/1489/head
ahopper 9 years ago
parent
commit
cea86f3647
  1. 4
      samples/ControlCatalog/ControlCatalog.csproj
  2. 1
      samples/ControlCatalog/MainView.xaml
  3. 49
      samples/ControlCatalog/Pages/PopupPage.xaml
  4. 19
      samples/ControlCatalog/Pages/PopupPage.xaml.cs

4
samples/ControlCatalog/ControlCatalog.csproj

@ -23,8 +23,6 @@
</PropertyGroup>
<ItemGroup>
<None Remove="Pages\ContextMenuPage.xaml" />
<None Remove="Pages\PopupPage.xaml" />
<None Remove="Pages\PopupPage.xaml.cs" />
</ItemGroup>
<ItemGroup>
<!-- A reference to the entire .NET Framework is automatically included -->
@ -86,7 +84,6 @@
<EmbeddedResource Include="Pages\NumericUpDownPage.xaml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Pages\PopupPage.xaml" />
<EmbeddedResource Include="Pages\ProgressBarPage.xaml">
<SubType>Designer</SubType>
</EmbeddedResource>
@ -161,7 +158,6 @@
<Compile Include="Pages\MenuPage.xaml.cs">
<DependentUpon>MenuPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\PopupPage.xaml.cs" />
<Compile Include="Pages\ProgressBarPage.xaml.cs">
<DependentUpon>ProgressBarPage.xaml</DependentUpon>
</Compile>

1
samples/ControlCatalog/MainView.xaml

@ -27,6 +27,5 @@
<TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
<TabItem Header="ToolTip"><pages:ToolTipPage/></TabItem>
<TabItem Header="TreeView"><pages:TreeViewPage/></TabItem>
<TabItem Header="Popup"><pages:PopupPage/></TabItem>
</TabControl>
</UserControl>

49
samples/ControlCatalog/Pages/PopupPage.xaml

@ -1,49 +0,0 @@
<UserControl xmlns="https://github.com/avaloniaui"
>
<StackPanel Orientation="Vertical" Gap="4">
<TextBlock Classes="h1">Popup</TextBlock>
<TextBlock Classes="h2">A Popup dialog</TextBlock>
<StackPanel Gap="4">
<ToggleButton IsChecked="{Binding #flyout.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Flyout Auto close</ToggleButton>
<ToggleButton IsChecked="{Binding #flyout2.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Flyout Toggle</ToggleButton>
<Popup Name="flyout" StaysOpen="False" Width="200" Height="100" >
<Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
<StackPanel>
<DropDown>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item A</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item B</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item C</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item D</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item E</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item F</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item G</DropDownItem>
</DropDown>
<ToggleButton IsChecked="{Binding #nestedflyout.IsOpen, Mode=TwoWay}" Width="150" ClickMode="Press" >Nested Auto close</ToggleButton>
<Popup Name="nestedflyout" StaysOpen="False" Width="200" Height="200" >
<Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
<StackPanel>
<TextBox>Nested Content</TextBox>
</StackPanel>
</Border>
</Popup>
</StackPanel>
</Border>
</Popup>
<Popup Name="flyout2" StaysOpen="True" Width="200" Height="100" >
<Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="6" >
<StackPanel>
<DropDown>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item A</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item B</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item C</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item D</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item E</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item F</DropDownItem>
<DropDownItem ToolTip.Tip="Yet another nested popup">Item G</DropDownItem>
</DropDown>
</StackPanel>
</Border>
</Popup>
</StackPanel>
</StackPanel>
</UserControl>

19
samples/ControlCatalog/Pages/PopupPage.xaml.cs

@ -1,19 +0,0 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace ControlCatalog.Pages
{
public class PopupPage : UserControl
{
public PopupPage()
{
this.InitializeComponent();
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}
Loading…
Cancel
Save