Skip to content

Commit b30c9a7

Browse files
committed
Update SettingItem style
1 parent b7299f5 commit b30c9a7

File tree

2 files changed

+36
-20
lines changed

2 files changed

+36
-20
lines changed

CefFlashBrowser/Themes/Generic.xaml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:CefFlashBrowser.Views.Custom"
5-
xmlns:sys="clr-namespace:System;assembly=mscorlib">
4+
xmlns:local="clr-namespace:CefFlashBrowser.Views.Custom">
5+
66

77

88

@@ -24,17 +24,7 @@
2424
<ColumnDefinition Width="Auto"/>
2525
</Grid.ColumnDefinitions>
2626
<ContentPresenter Grid.Column="0"
27-
Content="{TemplateBinding Description}">
28-
<ContentPresenter.ContentTemplate>
29-
<DataTemplate DataType="{x:Type sys:String}">
30-
<TextBlock Grid.Column="0"
31-
VerticalAlignment="Center"
32-
HorizontalAlignment="Left"
33-
TextTrimming="CharacterEllipsis"
34-
Text="{Binding}"/>
35-
</DataTemplate>
36-
</ContentPresenter.ContentTemplate>
37-
</ContentPresenter>
27+
Content="{TemplateBinding Description}"/>
3828
<ContentPresenter Grid.Column="2"
3929
Content="{TemplateBinding Content}"/>
4030
</Grid>

CefFlashBrowser/Views/SettingsWindow.xaml

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,21 @@
2424
<Style x:Key="SettingHeaderStyle"
2525
TargetType="TextBlock">
2626
<Setter Property="Margin"
27-
Value="5,15,5,10"/>
27+
Value="5,15,5,10"/>
2828
<Setter Property="FontSize"
29-
Value="18"/>
29+
Value="18"/>
3030
<Setter Property="FontWeight"
31-
Value="Bold"/>
31+
Value="Bold"/>
32+
</Style>
33+
34+
<Style x:Key="SettingItemDescriptionStyle"
35+
TargetType="TextBlock">
36+
<Setter Property="VerticalAlignment"
37+
Value="Center"/>
38+
<Setter Property="HorizontalAlignment"
39+
Value="Left"/>
40+
<Setter Property="TextTrimming"
41+
Value="CharacterEllipsis"/>
3242
</Style>
3343

3444
</Window.Resources>
@@ -43,7 +53,11 @@
4353
<TextBlock Text="{StaticResource settingHeader_addressBar}"
4454
Style="{StaticResource SettingHeaderStyle}"/>
4555

46-
<c:SettingItem Description="{StaticResource settingItem_useSearchEngine}">
56+
<c:SettingItem>
57+
<c:SettingItem.Description>
58+
<TextBlock Style="{StaticResource SettingItemDescriptionStyle}"
59+
Text="{StaticResource settingItem_useSearchEngine}"/>
60+
</c:SettingItem.Description>
4761
<c:SettingItem.Content>
4862
<ComboBox MinWidth="80"
4963
ItemsSource="{Binding NavigationTypes}"
@@ -60,7 +74,11 @@
6074
</c:SettingItem.Content>
6175
</c:SettingItem>
6276

63-
<c:SettingItem Description="{StaticResource settingItem_searchEngine}">
77+
<c:SettingItem>
78+
<c:SettingItem.Description>
79+
<TextBlock Style="{StaticResource SettingItemDescriptionStyle}"
80+
Text="{StaticResource settingItem_searchEngine}"/>
81+
</c:SettingItem.Description>
6482
<c:SettingItem.Content>
6583
<ComboBox MinWidth="80"
6684
ItemsSource="{Binding SearchEngines}"
@@ -86,7 +104,11 @@
86104
<TextBlock Text="{StaticResource settingHeader_browserData}"
87105
Style="{StaticResource SettingHeaderStyle}"/>
88106

89-
<c:SettingItem Description="{StaticResource settingItem_deleteCache}">
107+
<c:SettingItem>
108+
<c:SettingItem.Description>
109+
<TextBlock Style="{StaticResource SettingItemDescriptionStyle}"
110+
Text="{StaticResource settingItem_deleteCache}"/>
111+
</c:SettingItem.Description>
90112
<c:SettingItem.Content>
91113
<Button MinWidth="80"
92114
Content="{StaticResource button_deleteCache}"
@@ -97,7 +119,11 @@
97119
<TextBlock Text="{StaticResource settingHeader_aboutCef}"
98120
Style="{StaticResource SettingHeaderStyle}"/>
99121

100-
<c:SettingItem Description="{StaticResource settingItem_cefVersion}">
122+
<c:SettingItem>
123+
<c:SettingItem.Description>
124+
<TextBlock Style="{StaticResource SettingItemDescriptionStyle}"
125+
Text="{StaticResource settingItem_cefVersion}"/>
126+
</c:SettingItem.Description>
101127
<c:SettingItem.Content>
102128
<Button MinWidth="80"
103129
Content="{Binding Source={StaticResource AppInfo}, Path=CefSharpVersion, TargetNullValue={StaticResource button_viewDetails}}"

0 commit comments

Comments
 (0)