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

fix: adjust for themes breaking changes #1028

Merged
merged 2 commits into from
Feb 2, 2024
Merged

fix: adjust for themes breaking changes #1028

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
a108fad
fix: adjust for themes breaking changes
kazo0 Jan 31, 2024
a8cdcc2
chore: update themes
kazo0 Feb 2, 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
8 changes: 4 additions & 4 deletions samples/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.8.0-dev.1" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.8.0-dev.1" />
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.UI" Version="5.1.0-dev.975" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.0-dev.975" />
<PackageVersion Include="Uno.UI.RemoteControl" Version="5.1.0-dev.975" />
Expand Down
8 changes: 4 additions & 4 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<PackageVersion Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.1.4" />
<PackageVersion Include="Uno.SourceGenerationTasks" Version="4.2.0" />
<PackageVersion Include="Uno.WinUI.Markup" Version="5.1.4" />
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.6" />
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.9" />
<PackageVersion Include="Uno.UI" Version="5.0.19" />
<PackageVersion Include="Uno.WinUI" Version="5.0.19" />
<PackageVersion Include="Uno.XamlMerge.Task" Version="1.32.0-dev.61" />
Expand Down
4 changes: 2 additions & 2 deletions src/Uno.Toolkit.UI/Controls/Chips/Chip.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
Content="{TemplateBinding Icon}"
ContentTemplate="{TemplateBinding IconTemplate}"
Foreground="{ThemeResource ChipIconForeground}"
Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToCollapsed}, FallbackValue=Collapsed}" />
Visibility="{Binding Icon, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource NullToCollapsedConverter}, FallbackValue=Collapsed}" />

<!-- C1: Content -->
<ContentPresenter
Expand All @@ -271,7 +271,7 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource ChipDeleteIconButtonStyle}"
Visibility="{Binding CanRemove, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource FalseToCollapsed}, FallbackValue=Collapsed}" />
Visibility="{Binding CanRemove, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource FalseToCollapsedConverter}, FallbackValue=Collapsed}" />
</Grid>
</Grid>
</toolkit:ElevatedView>
Expand Down
2 changes: 1 addition & 1 deletion src/Uno.Toolkit.UI/Controls/DrawerControl/DrawerControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<!-- see: https://github.com/unoplatform/nventive-private/issues/271 -->
<Border x:Name="GestureInterceptor"
Background="Transparent"
Visibility="{Binding IsGestureEnabled, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialTrueToVisible}}" />
Visibility="{Binding IsGestureEnabled, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TrueToVisibleConverter}}" />
</Grid>
</ControlTemplate>
</Setter.Value>
Expand Down
4 changes: 2 additions & 2 deletions src/library/Uno.Toolkit.Material/Styles/Controls/v1/BottomTabBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
</Viewbox>

<!-- Icon/Content spacing -->
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
<Border Width="{StaticResource MaterialFabIconTextPadding}"
Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
</Border>
Expand Down Expand Up @@ -485,7 +485,7 @@
</Viewbox>

<!-- Icon/Content spacing -->
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialEmptyToCollapsed}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
<Border Visibility="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource EmptyToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}">
<Border Width="{StaticResource MaterialFabIconTextPadding}"
Visibility="{Binding Path=Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource MaterialNullToCollapsedConverter}, FallbackValue=Collapsed, TargetNullValue=Collapsed}" />
</Border>
Expand Down
Loading
Loading