Skip to content

Commit d286298

Browse files
CodectoryCodectory
committed
1.8.7
[Bug fixes] - UWP app selection was broken
1 parent 43660d8 commit d286298

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

‎Source/AutoHDR/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@
5252
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
5353
// indem Sie "*" wie unten gezeigt eingeben:
5454
// [assembly: AssemblyVersion("1.0.*")]
55-
[assembly: AssemblyVersion("1.8.6.0")]
56-
[assembly: AssemblyFileVersion("1.8.6.0")]
55+
[assembly: AssemblyVersion("1.8.7.0")]
56+
[assembly: AssemblyFileVersion("1.8.7.0")]

‎Source/AutoHDR/UWP/UWPApp.cs

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ private void ReadAppxManifest(Package package)
7171
{
7272
XmlSerializer serializer = new XmlSerializer(typeof(AppxManifest));
7373
AppxManifest appxManifest = (AppxManifest)serializer.Deserialize(reader);
74-
if (appxManifest.Applications==null)
7574
Name = ((XmlNode[])appxManifest.Properties.DisplayName)[0].Value;
7675
if (Name.Contains("ms-resource:"))
7776
{

‎Source/AutoHDR/Views/ApplicationAdderView.xaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@
2424
</Grid.ColumnDefinitions>
2525
<Label Grid.Column="0" Grid.Row="0" Content="{x:Static pres:ProjectLocales.DisplayName}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" FontSize="15"/>
2626
<Label Grid.Column="0" Grid.Row="1" Content="{x:Static pres:ProjectLocales.FilePath}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" />
27-
<Label Grid.Column="0" Grid.Row="2" Content="{x:Static pres:ProjectLocales.Icon}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" />
27+
<Label Grid.Column="0" Grid.Row="2" Content="{x:Static pres:ProjectLocales.Icon}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Center" />
2828

2929
<TextBox Grid.Column="1" Grid.Row="0" Height="Auto" Margin="5" TextWrapping="Wrap" Text="{Binding DisplayName, Mode=TwoWay }" VerticalAlignment="Top"/>
3030
<Label Grid.Column="1" Grid.Row="1" Content="{Binding FilePath}" Margin="5" Height="Auto" VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
31-
<Image Grid.Column="1" Grid.Row="2" Margin="5" Height="40" Width="40" Source="{Binding ApplicationItem.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Stretch="Uniform"/>
32-
31+
<Border Grid.Column="1" Grid.Row="2" Height="70" Width="70" Margin="5" CornerRadius="{StaticResource CornerRadius}" Background="#FF747474" HorizontalAlignment="Left"/>
32+
<Border Grid.Column="1" Grid.Row="2" Margin="5" Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}" HorizontalAlignment="Left">
33+
<Border.Background>
34+
<ImageBrush Stretch="Fill" ImageSource="{Binding ApplicationItem.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
35+
</Border.Background>
36+
</Border>
3337
<Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" >
3438
<Grid.ColumnDefinitions>
3539
<ColumnDefinition Width="Auto" />

‎Source/AutoHDR/Views/AutoHDRMainView.xaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,14 @@
147147
<TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" Text="{x:Static pres:ProjectLocales.CurrentProfile}" Width="Auto" FontWeight="Bold" Height="Auto" FontSize="25" VerticalAlignment="Center" Margin="5" />
148148
<TextBlock Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" Text="{x:Static pres:ProjectLocales.LastActions}" Width="Auto" FontWeight="Bold" Height="Auto" FontSize="25" VerticalAlignment="Top" Margin="5" />
149149

150-
<Border Grid.Row="2" Grid.Column="3" BorderThickness="1" BorderBrush="LightGray" Style="{StaticResource DefaultBorder}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Padding="0">
151-
<Rectangle RadiusX="3" RadiusY="3" Width="40" Height="40" Margin="2 ">
152-
<Rectangle.Fill>
153-
<ImageBrush ImageSource="{Binding CurrentApplication.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" Stretch="Fill" />
154-
</Rectangle.Fill>
155-
</Rectangle>
150+
151+
<Border Grid.Row="2" Grid.Column="3" Height="70" Width="70" Margin="5" CornerRadius="{StaticResource CornerRadius}" Background="#FF747474" HorizontalAlignment="Left"/>
152+
<Border Grid.Row="2" Grid.Column="3" Margin="5" Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}" HorizontalAlignment="Left">
153+
<Border.Background>
154+
<ImageBrush Stretch="Fill" ImageSource="{Binding CurrentApplication.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
155+
</Border.Background>
156156
</Border>
157+
157158
<TextBlock Grid.Row="2" Grid.Column="4" Text="{Binding CurrentApplication.DisplayName , FallbackValue={x:Static pres:ProjectLocales.NoApplication}}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
158159
<TextBlock Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5" Text="{Binding CurrentProfile.Name , FallbackValue={x:Static pres:ProjectLocales.NoProfile}}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
159160
<Border Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2" Style="{StaticResource DefaultBorder}" >

‎Source/AutoHDR/Views/UWPApplicationDialogView.xaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@
1414
<StackPanel/>
1515
</ItemsPanelTemplate>
1616
<DataTemplate x:Key="ApplicationItemTemplate" DataType="ApplicationItem">
17-
<Grid >
17+
<Grid Margin="5">
1818
<Grid.ColumnDefinitions>
1919
<ColumnDefinition Width="Auto"/>
2020
<ColumnDefinition Width="*"/>
2121
</Grid.ColumnDefinitions>
22-
<Border CornerRadius="{StaticResource CornerRadius}" Background="#FF747474">
23-
<Image Grid.Column="0" Source="{Binding Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" Width="40" Height="40" Margin="5" Stretch="Fill"></Image>
22+
<Border Grid.Column="0" Height="70" Width="70" Margin="5" CornerRadius="{StaticResource CornerRadius}" Background="#FF747474" HorizontalAlignment="Left"/>
23+
<Border Grid.Column="0" Margin="5" Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}" HorizontalAlignment="Left">
24+
<Border.Background>
25+
<ImageBrush Stretch="Fill" ImageSource="{Binding Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
26+
</Border.Background>
2427
</Border>
28+
2529
<TextBlock Grid.Column="1" Text="{Binding DisplayName}" Margin="5" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" />
2630
</Grid>
2731
</DataTemplate>
@@ -33,7 +37,7 @@
3337
<RowDefinition Height="*"/>
3438
<RowDefinition Height="Auto"/>
3539
</Grid.RowDefinitions>
36-
<ListBox Grid.Row="0" x:Name="ApplicationList" SelectedItem="{Binding ApplicationItem}" HorizontalContentAlignment="Stretch" ItemsPanel="{StaticResource StackListViewTemplate}" ItemTemplate="{StaticResource ApplicationItemTemplate}" ItemsSource="{Binding UWPApplications}" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" Margin="0,0,0,5"/>
40+
<ListBox Grid.Row="0" x:Name="ApplicationList" SelectedItem="{Binding ApplicationItem}" ItemContainerStyle="{StaticResource ListBoxItemStyle}" HorizontalContentAlignment="Stretch" ItemsPanel="{StaticResource StackListViewTemplate}" ItemTemplate="{StaticResource ApplicationItemTemplate}" ItemsSource="{Binding UWPApplications}" ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" Margin="0,0,0,5"/>
3741

3842
<Grid Grid.Row="1" Height="Auto">
3943
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)