Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Flyout and Popup APIs to make gap between them smaller #10492

Merged
merged 13 commits into from
Mar 7, 2023
Merged

Update Flyout and Popup APIs to make gap between them smaller #10492

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aa2ad65
Remove FlyoutPlacementMode and improve PlacementMode instead
maxkatz6 Feb 26, 2023
733238a
Implement PlacementMode.Center
maxkatz6 Feb 26, 2023
8281c6e
Split FlyoutBase and PopupFlyoutBase
maxkatz6 Feb 26, 2023
4e47a27
Add some popup properties to the PopupFlyoutBase
maxkatz6 Feb 26, 2023
d249848
Simplify PlacementMode.Center
maxkatz6 Feb 26, 2023
5847560
Try to fix last known position reset
maxkatz6 Feb 27, 2023
6496abf
Changes after review, added FlyoutPresenterTheme
maxkatz6 Feb 27, 2023
474573b
Merge remote-tracking branch 'origin/master' into flyout-api
maxkatz6 Mar 4, 2023
d53844e
Merge branch 'master' into flyout-api
danwalmsley Mar 5, 2023
7947ec9
Merge branch 'master' into flyout-api
maxkatz6 Mar 7, 2023
67f5201
Fix tests
maxkatz6 Mar 7, 2023
7452980
Move _lastKnownPosition
maxkatz6 Mar 7, 2023
2473bb8
Fix some warnings
maxkatz6 Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions samples/ControlCatalog/Pages/ContextFlyoutPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ public ContextFlyoutPage()
customContextRequestedBorder.AddHandler(ContextRequestedEvent, CustomContextRequested, RoutingStrategies.Tunnel);

var cancellableContextBorder = this.Get<Border>("CancellableContextBorder");
cancellableContextBorder.ContextFlyout!.Closing += ContextFlyoutPage_Closing;
cancellableContextBorder.ContextFlyout!.Opening += ContextFlyoutPage_Opening;
var flyout = (Flyout)cancellableContextBorder.ContextFlyout!;
flyout.Closing += ContextFlyoutPage_Closing;
flyout.Opening += ContextFlyoutPage_Opening;
}

private ContextPageViewModel? _model;
Expand Down
9 changes: 9 additions & 0 deletions samples/ControlCatalog/Pages/FlyoutsPage.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@
</Flyout>
</Button.Flyout>
</Button>
<Button Content="Placement=Center">
<Button.Flyout>
<Flyout Placement="Center">
<Panel Width="100" Height="100">
<TextBlock Text="Flyout Content!" />
</Panel>
</Flyout>
</Button.Flyout>
</Button>
<Button Content="Placement=TopEdgeAlignedLeft">
<Button.Flyout>
<Flyout Placement="TopEdgeAlignedLeft">
Expand Down
2 changes: 1 addition & 1 deletion src/Avalonia.Controls/Flyouts/Flyout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Avalonia.Controls
{
public class Flyout : FlyoutBase
public class Flyout : PopupFlyoutBase
{
/// <summary>
/// Defines the <see cref="Content"/> property
Expand Down
Loading