DeGsoft
/
maui-linux
зеркало из https://github.com/DeGsoft/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert "Jimmgarrido uwp toolbar (#588)" 

This reverts commit 1ff0db9c6f.
This commit is contained in:
Stephane Delcroix 2016-12-01 22:54:14 +01:00
Родитель 3ff3487d4f
Коммит 84f42e5b14
5 изменённых файлов: 7 добавлений и 51 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

39
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47295.cs
Просмотреть файл

@ -1,39 +0,0 @@
using Xamarin.Forms.CustomAttributes;
using Xamarin.Forms.Internals;
#if UITEST
using Xamarin.UITest;
using NUnit.Framework;
#endif
namespace Xamarin.Forms.Controls.Issues
{
[Preserve(AllMembers = true)]
[Issue(IssueTracker.Bugzilla, 47295, "Toolbar in a NavigationPage is clipped when expanded", PlatformAffected.WinRT)]
public class Bugzilla47295 : TestNavigationPage
{
protected override void Init()
{
PushAsync(new TestPage47295());
}
}
[Preserve(AllMembers = true)]
public class TestPage47295 : ContentPage
{
public TestPage47295()
{
var descLabel = new Label { Text = "Press '...' to expand the CommandBar. The ToolbarItem's text label should not be clipped." };
var pressedLabel = new Label { Text = "ToolbarItem pressed.", IsVisible = false };
Content = new StackLayout
{
Children = {
descLabel,
pressedLabel
}
};
ToolbarItems.Add(new ToolbarItem("Test", "toolbar_close", () => pressedLabel.IsVisible = true));
}
}
}

3
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Просмотреть файл

@ -140,7 +140,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla44476.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla46630.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla47971.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla47295.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CarouselAsync.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla34561.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bugzilla34727.cs" />
@ -606,4 +605,4 @@
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>
</Project>
</Project>

5
Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml
Просмотреть файл

@ -3,8 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uwp="using:Xamarin.Forms.Platform.UWP">
<Style TargetType="uwp:MasterDetailControl">
<Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/>
<Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
<Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="uwp:MasterDetailControl">
@ -48,7 +47,7 @@
</StackPanel>
<Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch">
<uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" />
<uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" />
</Border>
</Grid>

5
Xamarin.Forms.Platform.UAP/PageControlStyle.xaml
Просмотреть файл

@ -4,8 +4,7 @@
xmlns:uwp="using:Xamarin.Forms.Platform.UWP">
<Style TargetType="uwp:PageControl">
<Setter Property="ContentMargin" Value="0" />
<Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/>
<Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
<Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="uwp:PageControl">
@ -28,7 +27,7 @@
</Border>
<Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch">
<uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" />
<uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" />
</Border>
</Grid>

6
Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml
Просмотреть файл

@ -3,9 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uwp="using:Xamarin.Forms.Platform.UWP">
<Style x:Key="TabbedPageStyle" TargetType="uwp:FormsPivot">
<Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/>
<Setter Property="HeaderTemplate">
<Setter Property="HeaderTemplate">
<Setter.Value>
<DataTemplate>
<TextBlock Name="TabbedPageHeaderTextBlock" Text="{Binding Title}" Style="{ThemeResource BodyTextBlockStyle}" />
@ -77,7 +75,7 @@
</Border>
<Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch">
<uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" />
<uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" />
</Border>
</Grid>