Skip to content

Commit f22f51b

Browse files
CodectoryCodectory
committed
1.8.5
[Changed] - Visual changes [Bug fixes] - Profiles section: The rounded boxes extend beyond the area on the left #76
1 parent 159bcc8 commit f22f51b

File tree

4 files changed

+77
-45
lines changed

4 files changed

+77
-45
lines changed

‎Source/AutoHDR/App.xaml‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,34 @@
2323
</ResourceDictionary.MergedDictionaries>
2424
<system:String x:Key="DonateLink">https://paypal.me/HeikoH89</system:String>
2525
<system:String x:Key="GitHubRepoLink">https://github.com/Codectory/AutoHDR</system:String>
26-
27-
2826

2927

30-
<Style x:Key="DefaultLabel" TargetType="Label">
28+
<Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
29+
<Setter Property="Template">
30+
<Setter.Value>
31+
<ControlTemplate TargetType="ListBoxItem">
32+
<Grid>
33+
<Border Name="_Border"
34+
Padding="2"
35+
SnapsToDevicePixels="true" Margin="5">
36+
</Border>
37+
<ContentPresenter />
38+
39+
</Grid>
40+
<ControlTemplate.Triggers>
41+
<Trigger Property="IsSelected" Value="true">
42+
<Setter TargetName="_Border" Property="Background" Value="{StaticResource HighlightedBrush}"/>
43+
<Setter Property="Foreground" Value="Black"/>
44+
</Trigger>
45+
</ControlTemplate.Triggers>
46+
</ControlTemplate>
47+
</Setter.Value>
48+
</Setter>
49+
</Style>
50+
51+
52+
53+
<Style x:Key="DefaultLabel" TargetType="Label">
3154
<Setter Property="FontSize" Value="{StaticResource DefaultFontSize}"/>
3255
</Style>
3356
<Style TargetType="Label" BasedOn="{StaticResource DefaultLabel}"/>

‎Source/AutoHDR/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
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.4.0")]
56-
[assembly: AssemblyFileVersion("1.8.4.0")]
55+
[assembly: AssemblyVersion("1.8.5.0")]
56+
[assembly: AssemblyFileVersion("1.8.5.0")]

‎Source/AutoHDR/Views/AutoHDRMainView.xaml‎

Lines changed: 44 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<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" />
159159
<Border Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2" Style="{StaticResource DefaultBorder}" >
160160
</Border>
161-
<ListBox Margin="5" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2" BorderThickness="0" ItemsSource="{Binding LastActions}" ItemTemplate="{StaticResource ProfileActionTemplate}" ItemsPanel="{StaticResource StackListViewTemplate}" />
161+
<ItemsControl Margin="8" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2" BorderThickness="0" ItemsSource="{Binding LastActions}" ItemTemplate="{StaticResource ProfileActionTemplate}" ItemsPanel="{StaticResource StackListViewTemplate}" />
162162

163163
</Grid>
164164

@@ -208,47 +208,58 @@
208208
<RowDefinition Height="*"/>
209209
<RowDefinition Height="Auto" />
210210
</Grid.RowDefinitions>
211-
<Border Style="{StaticResource DefaultBorder}" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="3"/>
212211

213212
<Grid Grid.IsSharedSizeScope="True" Grid.ColumnSpan="3" Margin="10,10,10,10" >
214-
<ListBox Name="ApplicationList" ItemsSource="{Binding Settings.ApplicationProfileAssignments}" HorizontalContentAlignment="Stretch" >
213+
<ListBox Name="ApplicationList" ItemContainerStyle="{StaticResource ListBoxItemStyle }" ItemsSource="{Binding Settings.ApplicationProfileAssignments}" HorizontalContentAlignment="Stretch" >
215214
<ListBox.Template>
216215
<ControlTemplate>
217-
<ScrollViewer>
218216
<DockPanel LastChildFill="True">
219-
<Grid DockPanel.Dock="Top" Height="30" Margin="0,0,0,5" >
220-
<Grid.ColumnDefinitions>
221-
<ColumnDefinition SharedSizeGroup="PriorityColumn" />
222-
<ColumnDefinition SharedSizeGroup="IconColumn"/>
223-
<ColumnDefinition SharedSizeGroup="ApplicationColumn"/>
224-
<ColumnDefinition />
225-
</Grid.ColumnDefinitions>
226-
<Label Grid.Column="0" FontWeight="Bold" Margin="5,0" Content="{x:Static pres:ProjectLocales.Priority}"/>
227-
<Label Grid.Column="1" FontWeight="Bold" Margin="5,0" Content="{x:Static pres:ProjectLocales.Icon}"/>
228-
<Label Grid.Column="2" FontWeight="Bold" Margin="5,0" Content="{x:Static pres:ProjectLocales.Application}"/>
229-
<Label Grid.Column="3" FontWeight="Bold" Margin="5,0" Content="{x:Static pres:ProjectLocales.Profile}"/>
230-
</Grid>
231-
<ItemsPresenter></ItemsPresenter>
232-
</DockPanel>
233-
</ScrollViewer>
217+
218+
<Grid DockPanel.Dock="Top" Height="Auto" Margin="0,0,0,5" >
219+
<Grid.ColumnDefinitions>
220+
<ColumnDefinition SharedSizeGroup="PriorityColumn" />
221+
<ColumnDefinition SharedSizeGroup="IconColumn"/>
222+
<ColumnDefinition SharedSizeGroup="ApplicationColumn"/>
223+
<ColumnDefinition />
224+
</Grid.ColumnDefinitions>
225+
<Label Grid.Column="0" FontWeight="Bold" FontSize="25" Margin="5,0" Content="{x:Static pres:ProjectLocales.Priority}"/>
226+
<Label Grid.Column="1" FontWeight="Bold" FontSize="25" Margin="5,0" Content="{x:Static pres:ProjectLocales.Icon}"/>
227+
<Label Grid.Column="2" FontWeight="Bold" FontSize="25" Margin="5,0" Content="{x:Static pres:ProjectLocales.Application}"/>
228+
<Label Grid.Column="3" FontWeight="Bold" FontSize="25" Margin="5,0" Content="{x:Static pres:ProjectLocales.Profile}"/>
229+
</Grid>
230+
<Grid>
231+
<Border Style="{StaticResource DefaultBorder}" />
232+
<ScrollViewer>
233+
<ItemsPresenter Margin="5"></ItemsPresenter>
234+
</ScrollViewer>
235+
</Grid>
236+
237+
</DockPanel>
238+
234239
</ControlTemplate>
235240
</ListBox.Template>
236241
<ListBox.ItemTemplate>
237242
<DataTemplate>
238-
<Grid Margin="0,2" >
239-
<Grid.ColumnDefinitions>
240-
<ColumnDefinition SharedSizeGroup="PriorityColumn" Width="Auto"/>
241-
<ColumnDefinition SharedSizeGroup="IconColumn" Width="Auto"/>
242-
<ColumnDefinition SharedSizeGroup="ApplicationColumn" Width="Auto"/>
243-
<ColumnDefinition Width="*"/>
244-
</Grid.ColumnDefinitions>
245-
<TextBlock Grid.Column="0" Margin="5,0" Width="Auto" FontSize="15" Text="{Binding Position}" VerticalAlignment="Center" HorizontalAlignment="Left" />
246-
<Border Grid.Column="1" CornerRadius="{StaticResource CornerRadius}" Background="#FF747474">
247-
<Image Margin="5,0" Source="{Binding Application.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" Width="50" Height="50" Stretch="Fill"></Image>
248-
</Border>
249-
<TextBlock Grid.Column="2" Width="Auto" Margin="5,0" FontSize="15" Text="{Binding Application.DisplayName}" VerticalAlignment="Center" HorizontalAlignment="Left" />
250-
<ComboBox Grid.Column="3" Width="Auto" Margin="5,0" FontSize="15" FontWeight="Bold" SelectedItem="{Binding Profile}" ItemTemplate="{StaticResource ProfileItemTemplate}" ItemsSource="{Binding ElementName=MainWindow , Path=DataContext.Settings.ApplicationProfiles}" VerticalAlignment="Center" />
251-
</Grid>
243+
<Border>
244+
<Grid Margin="0,2" >
245+
<Grid.ColumnDefinitions>
246+
<ColumnDefinition SharedSizeGroup="PriorityColumn" Width="Auto"/>
247+
<ColumnDefinition SharedSizeGroup="IconColumn" Width="Auto"/>
248+
<ColumnDefinition SharedSizeGroup="ApplicationColumn" Width="Auto"/>
249+
<ColumnDefinition Width="*"/>
250+
</Grid.ColumnDefinitions>
251+
<Label Grid.Column="0" Padding="15,0" Width="Auto" FontSize="15" Content="{Binding Position}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" />
252+
<Border Width="70" Grid.Column="1" CornerRadius="{StaticResource CornerRadius}" Background="#FF747474">
253+
<Border Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}">
254+
<Border.Background>
255+
<ImageBrush Stretch="Fill" ImageSource="{Binding Application.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
256+
</Border.Background>
257+
</Border>
258+
</Border>
259+
<Label Grid.Column="2" Width="Auto" Padding="5,0" FontSize="15" Content="{Binding Application.DisplayName}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" />
260+
<ComboBox VerticalContentAlignment="Stretch" Grid.Column="3" Width="Auto" Margin="5,0,10,0" FontSize="15" FontWeight="Bold" SelectedItem="{Binding Profile}" ItemTemplate="{StaticResource ProfileItemTemplate}" ItemsSource="{Binding ElementName=MainWindow , Path=DataContext.Settings.ApplicationProfiles}" VerticalAlignment="Center" />
261+
</Grid>
262+
</Border>
252263
</DataTemplate>
253264
</ListBox.ItemTemplate>
254265
</ListBox>

‎Source/AutoHDR/Views/ProfileManagerView.xaml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222

2323
<DataTemplate x:Key="ProfileItemTemplate" DataType="Profile" >
2424
<Grid>
25-
<Border Style="{StaticResource DefaultBorder}" Margin="5,5">
26-
</Border>
27-
<TextBlock Text="{Binding Name, Mode=OneWay}" Margin="10,10" VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="DemiBold"/>
25+
26+
<TextBlock Text="{Binding Name, Mode=OneWay}" Margin="15,10" VerticalAlignment="Center" HorizontalAlignment="Stretch" FontWeight="DemiBold" TextTrimming="CharacterEllipsis"/>
2827

2928
</Grid>
3029
</DataTemplate>
@@ -77,8 +76,8 @@
7776
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static pres:ProjectLocales.Profiles}" Margin="5" FontWeight="Bold" FontSize="25"></TextBlock>
7877
<TextBlock Grid.Column="1" Grid.Row="0" Text="{x:Static pres:ProjectLocales.CurrentProfile}" Margin="5" FontWeight="Bold" FontSize="25"></TextBlock>
7978
<Border Grid.Column="0" Grid.Row="1" Style="{StaticResource DefaultBorder}" Margin="10,10,10,10"/>
80-
<ListBox Grid.Column="0" Grid.Row="1" Margin="5,10" x:Name="ProfileList" HorizontalContentAlignment="Stretch" ItemTemplate="{StaticResource ProfileItemTemplate}" ItemsSource="{Binding Settings.ApplicationProfiles}" ScrollViewer.VerticalScrollBarVisibility="Auto" Background="{x:Null}" BorderThickness="0" SelectionMode="Single"/>
81-
79+
<ListBox Grid.Column="0" Grid.Row="1" Margin="5,10" x:Name="ProfileList" HorizontalContentAlignment="Stretch" ItemTemplate="{StaticResource ProfileItemTemplate}" ItemContainerStyle="{StaticResource ListBoxItemStyle}" ItemsSource="{Binding Settings.ApplicationProfiles}" ScrollViewer.VerticalScrollBarVisibility="Auto" Background="{x:Null}" BorderThickness="0" SelectionMode="Single"/>
80+
<GridSplitter/>
8281
<Border Grid.Column="1" Grid.Row="1" Style="{StaticResource DefaultBorder}" Margin="10,10,10,10"/>
8382
<ScrollViewer Grid.Column="1" Grid.Row="1" Margin="15" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
8483
<!--<Grid Margin="5" DataContext="{Binding ElementName=ProfileList, Path=SelectedItem}">-->
@@ -111,7 +110,7 @@
111110
<CheckBox Grid.Column="1" Grid.Row="1" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" IsChecked="{Binding RestartApplication, Mode=TwoWay}" VerticalAlignment="Center" Margin="10,0,0,0" HorizontalAlignment="Left" />
112111

113112
<Border Grid.Column="1" Grid.Row="3" Style="{StaticResource DefaultBorder}" Margin="10,2" Height="120"/>
114-
<Grid Grid.Column="1" Grid.Row="3" Margin="10,5">
113+
<Grid Grid.Column="1" Grid.Row="3" Margin="10,5">
115114
<Grid.ColumnDefinitions>
116115
<ColumnDefinition Width="Auto"/>
117116
<ColumnDefinition/>
@@ -122,7 +121,6 @@
122121
</ScrollViewer>
123122

124123
</Grid>
125-
126124
<Border Grid.Column="1" Grid.Row="4" Style="{StaticResource DefaultBorder}" Margin="10,2" Height="120"/>
127125
<Grid Grid.Column="1" Grid.Row="4" Margin="10,2">
128126
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)