github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move overflow textblock to ItemsControl

Browse source
This commit is contained in:
Jérôme Laban 2019-05-17 11:25:39 -04:00
commit 2646a667cd
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Calculator.Shared/Views/Calculator.xaml
View file

@ -168,7 +168,7 @@
</Setter> </Setter>
</Style> </Style>
<!-- UNO TODO --> <!-- UNO TODO -->
<Style x:Key="overflowTextBlockStyle" TargetType="controls:OverflowTextBlock"> <Style x:Key="overflowTextBlockStyle" TargetType="controls:OverflowTextBlock">
<Setter Property="HorizontalAlignment" <Setter Property="HorizontalAlignment"
@ -193,30 +193,26 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Style="{StaticResource ResultsScrollerSnapped}" Style="{StaticResource ResultsScrollerSnapped}"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<ListView x:Name="TokenList" <!-- UNO TODO-->
<ItemsControl x:Name="TokenList"
Padding="0" Padding="0"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
HorizontalContentAlignment="Right" HorizontalContentAlignment="Right"
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
IsTabStop="False" IsTabStop="False"
ItemTemplateSelector="{StaticResource ExpressionItemTemplateSelector}" ItemTemplateSelector="{StaticResource ExpressionItemTemplateSelector}"
ItemsSource="{Binding ExpressionTokens}" ItemsSource="{Binding ExpressionTokens}">
ScrollViewer.HorizontalScrollBarVisibility="Hidden" <ItemsControl.ItemsPanel>
ScrollViewer.HorizontalScrollMode="Enabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollMode="Disabled"
SelectionMode="None">
<ListView.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel HorizontalAlignment="Right" <StackPanel HorizontalAlignment="Right"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Orientation="Horizontal" /> Orientation="Horizontal" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListView.ItemsPanel> </ItemsControl.ItemsPanel>
<ListView.ItemContainerTransitions> <ItemsControl.ItemContainerTransitions>
<TransitionCollection /> <TransitionCollection />
</ListView.ItemContainerTransitions> </ItemsControl.ItemContainerTransitions>
</ListView> </ItemsControl>
</ScrollViewer> </ScrollViewer>
<Button x:Name="scrollLeft" <Button x:Name="scrollLeft"
x:Uid="scrollLeft" x:Uid="scrollLeft"