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

Revert ios button changes #22300

Merged
merged 2 commits into from
May 9, 2024
Merged

Revert ios button changes #22300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb6395a
Revert changes for iOS Button Layout Fixes
PureWeen May 8, 2024
39c1ef4
Revert "[iOS] Allow compat iOS buttons to resize image and to respect…
PureWeen May 8, 2024
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
45 changes: 45 additions & 0 deletions src/Controls/samples/Controls.Sample.UITests/Issues/Issue22288.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Maui.Controls.Sample.Issues.Issue22288"
Title="Issue22288">
<ScrollView AutomationId="outerScrollView">
<Grid Margin="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<Grid Grid.Column="0" Grid.Row="2" Margin="20,5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="4.5*" />
<RowDefinition Height="*" />
<RowDefinition Height="4.5*" />
</Grid.RowDefinitions>

<Label Grid.Column="0" Grid.Row="0" Text="Search by meal type" SemanticProperties.HeadingLevel="Level2" FontSize="24" FontAttributes="Bold" />
<ScrollView Grid.Column="0" Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,10">
<StackLayout Orientation="Horizontal" Spacing="10" Padding="0,5">
<Button Text="Breakfast" ContentLayout="Top,0" ImageSource="dotnet_bot.png" Padding="5,15" />
<Button Text="Lunch" ContentLayout="Top,0" ImageSource="dotnet_bot.png" Padding="5,15" />
<Button Text="Dinner" ContentLayout="Top,0" ImageSource="dotnet_bot.png" Padding="5,15" />
<Button Text="Snack" ContentLayout="Top,0" ImageSource="dotnet_bot.png" Padding="5,15" />
<Button Text="Dessert" ContentLayout="Top,0" ImageSource="dotnet_bot.png" Padding="5,15"/>
<Button Text="Drinks" ContentLayout="Top,0" ImageSource="dotnet_bot.png" Padding="5,15" />
</StackLayout>
</ScrollView>

<Label Grid.Column="0" Grid.Row="2" Text="Search by diet" SemanticProperties.HeadingLevel="Level2" FontSize="24" FontAttributes="Bold" />

</Grid>
</Grid>
</ScrollView>
</ContentPage>
14 changes: 14 additions & 0 deletions src/Controls/samples/Controls.Sample.UITests/Issues/Issue22288.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace Maui.Controls.Sample.Issues;
using System;
using Microsoft.Maui;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.Xaml;

[Issue(IssueTracker.Github, 22288, "Top Button Content Causes Infinite Layout", PlatformAffected.iOS)]
public partial class Issue22288 : ContentPage
{
public Issue22288()
{
InitializeComponent();
}
}
Loading
Loading