Skip to content

Commit cfe760a

Browse files
jjw24jjw24
authored
Merge pull request #1119 from onesounds/antialising
Remove All Cleartype Rendering
2 parents d1c69d6 + 4183f93 commit cfe760a

File tree

1 file changed

+108
-89
lines changed

1 file changed

+108
-89
lines changed

‎Flow.Launcher/Themes/Base.xaml

Lines changed: 108 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:system="clr-namespace:System;assembly=mscorlib"
4-
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:system="clr-namespace:System;assembly=mscorlib"
5+
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure">
56

6-
<!-- Further font customisations are dynamically loaded in Theme.cs -->
7+
<!-- Further font customisations are dynamically loaded in Theme.cs -->
78
<Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
89
<Setter Property="BorderThickness" Value="0" />
910
<Setter Property="FontSize" Value="28" />
1011
<Setter Property="FontWeight" Value="Regular" />
11-
<Setter Property="Margin" Value="16 7 0 7" />
12-
<Setter Property="Padding" Value="0 4 68 0" />
12+
<Setter Property="Margin" Value="16,7,0,7" />
13+
<Setter Property="Padding" Value="0,4,68,0" />
1314
<Setter Property="Background" Value="#2F2F2F" />
1415
<Setter Property="Height" Value="48" />
1516
<Setter Property="Foreground" Value="#E3E0E3" />
@@ -20,13 +21,22 @@
2021
<Setter Property="Template">
2122
<Setter.Value>
2223
<ControlTemplate TargetType="{x:Type TextBox}">
23-
<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
24-
<ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
25-
Background="{TemplateBinding Background}">
24+
<Border
25+
x:Name="border"
26+
Background="{TemplateBinding Background}"
27+
BorderBrush="{TemplateBinding BorderBrush}"
28+
BorderThickness="{TemplateBinding BorderThickness}"
29+
SnapsToDevicePixels="True">
30+
<ScrollViewer
31+
x:Name="PART_ContentHost"
32+
Background="{TemplateBinding Background}"
33+
Focusable="false"
34+
HorizontalScrollBarVisibility="Hidden"
35+
VerticalScrollBarVisibility="Hidden">
2636
<ScrollViewer.ContentTemplate>
2737
<DataTemplate>
28-
<Grid Background="{Binding Background, ElementName=PART_ContentHost}" RenderOptions.ClearTypeHint="Enabled">
29-
<ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}"></ContentPresenter>
38+
<Grid Background="{Binding Background, ElementName=PART_ContentHost}">
39+
<ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}" />
3040
</Grid>
3141
</DataTemplate>
3242
</ScrollViewer.ContentTemplate>
@@ -37,47 +47,47 @@
3747
</Setter>
3848
</Style>
3949

40-
<!-- Further font customisations are dynamically loaded in Theme.cs -->
41-
<Style x:Key="BaseQuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
50+
<!-- Further font customisations are dynamically loaded in Theme.cs -->
51+
<Style
52+
x:Key="BaseQuerySuggestionBoxStyle"
53+
BasedOn="{StaticResource BaseQueryBoxStyle}"
54+
TargetType="{x:Type TextBox}">
4255
<Setter Property="Foreground" Value="DarkGray" />
4356
<Setter Property="Height" Value="48" />
44-
<Setter Property="Margin" Value="16 7 0 7" />
57+
<Setter Property="Margin" Value="16,7,0,7" />
4558
<Setter Property="Background" Value="Transparent" />
46-
<Setter Property="Padding" Value="0 4 68 0" />
59+
<Setter Property="Padding" Value="0,4,68,0" />
4760
<Setter Property="HorizontalAlignment" Value="Stretch" />
4861
<Setter Property="VerticalAlignment" Value="Center" />
4962
</Style>
5063

5164
<Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
5265
<Setter Property="BorderThickness" Value="0" />
53-
<Setter Property="Background" Value="#2F2F2F"></Setter>
54-
<Setter Property="Padding" Value="0 0 0 0" />
66+
<Setter Property="Background" Value="#2F2F2F" />
67+
<Setter Property="Padding" Value="0,0,0,0" />
5568
<Setter Property="CornerRadius" Value="5" />
5669
</Style>
5770
<Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
5871
<Setter Property="Width" Value="600" />
59-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
6072
</Style>
6173

6274
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
6375
<Setter Property="CornerRadius" Value="5" />
6476
</Style>
65-
77+
6678
<Style x:Key="BasePendingLineStyle" TargetType="{x:Type Line}">
6779
<Setter Property="Stroke" Value="Blue" />
6880
</Style>
6981

70-
71-
<!-- Item Style -->
82+
83+
<!-- Item Style -->
7284
<Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
7385
<Setter Property="Foreground" Value="#FFFFF8" />
7486
<Setter Property="FontSize" Value="16" />
7587
<Setter Property="FontWeight" Value="Medium" />
76-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
7788
</Style>
78-
<Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}" >
89+
<Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}">
7990
<Setter Property="Foreground" Value="#D9D9D4" />
80-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
8191
<Setter Property="FontSize" Value="13" />
8292
<Setter Property="FontWeight" Value="Normal" />
8393
<Style.Triggers>
@@ -89,44 +99,40 @@
8999
<Style x:Key="BaseItemNumberStyle" TargetType="{x:Type TextBlock}">
90100
<Setter Property="VerticalAlignment" Value="Center" />
91101
<Setter Property="HorizontalAlignment" Value="Center" />
92-
<Setter Property="Margin" Value="3 0 0 0" />
102+
<Setter Property="Margin" Value="3,0,0,0" />
93103
<Setter Property="FontSize" Value="22" />
94-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
95104
</Style>
96105
<Style x:Key="BaseGlyphStyle" TargetType="{x:Type TextBlock}">
97106
<Setter Property="Foreground" Value="#ffffff" />
98107
<Setter Property="VerticalAlignment" Value="Center" />
99108
<Setter Property="HorizontalAlignment" Value="Center" />
100109
<Setter Property="Width" Value="25" />
101110
<Setter Property="Height" Value="25" />
102-
<Setter Property="FontSize" Value="25"/>
111+
<Setter Property="FontSize" Value="25" />
103112
</Style>
104-
<Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
113+
<Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
105114
<Setter Property="Foreground" Value="#FFFFF8" />
106115
<Setter Property="FontSize" Value="16" />
107116
<Setter Property="FontWeight" Value="Normal" />
108-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
109117
</Style>
110-
<Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
118+
<Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
111119
<Setter Property="Foreground" Value="#D9D9D4" />
112120
<Setter Property="FontSize" Value="13" />
113-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
114121
<Style.Triggers>
115122
<DataTrigger Binding="{Binding ElementName=SubTitle, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
116123
<Setter Property="Height" Value="0" />
117124
</DataTrigger>
118125
</Style.Triggers>
119126
</Style>
120-
<Style x:Key="BaseItemImageSelectedStyle" TargetType="{x:Type Image}" >
121-
</Style>
127+
<Style x:Key="BaseItemImageSelectedStyle" TargetType="{x:Type Image}" />
122128

123129
<Style x:Key="BaseListboxStyle" TargetType="{x:Type ListBox}">
124-
<Setter Property="BorderBrush" Value="Transparent"/>
125-
<Setter Property="Background" Value="Transparent"/>
126-
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
127-
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
128-
<Setter Property="Margin" Value="0 0 0 0" />
129-
<Setter Property="Padding" Value="0 0 0 0" />
130+
<Setter Property="BorderBrush" Value="Transparent" />
131+
<Setter Property="Background" Value="Transparent" />
132+
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
133+
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
134+
<Setter Property="Margin" Value="0,0,0,0" />
135+
<Setter Property="Padding" Value="0,0,0,0" />
130136
<Setter Property="Template">
131137
<Setter.Value>
132138
<ControlTemplate TargetType="ListBox">
@@ -135,12 +141,12 @@
135141
<Style TargetType="ScrollViewer">
136142
<Style.Triggers>
137143
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible">
138-
<Setter Property="Margin" Value="0 0 0 0" />
139-
<Setter Property="Padding" Value="0 0 0 0" />
144+
<Setter Property="Margin" Value="0,0,0,0" />
145+
<Setter Property="Padding" Value="0,0,0,0" />
140146
</Trigger>
141147
<Trigger Property="ComputedVerticalScrollBarVisibility" Value="Collapsed">
142-
<Setter Property="Margin" Value="0 0 0 0" />
143-
<Setter Property="Padding" Value="0 0 0 0" />
148+
<Setter Property="Margin" Value="0,0,0,0" />
149+
<Setter Property="Padding" Value="0,0,0,0" />
144150
</Trigger>
145151
</Style.Triggers>
146152
</Style>
@@ -152,52 +158,58 @@
152158
</Setter>
153159
</Style>
154160

155-
<!-- ScrollViewer Style -->
161+
<!-- ScrollViewer Style -->
156162
<ControlTemplate x:Key="ScrollViewerControlTemplate" TargetType="{x:Type ScrollViewer}">
157163
<Grid x:Name="Grid" Background="{TemplateBinding Background}">
158164
<Grid.ColumnDefinitions>
159165
<ColumnDefinition Width="*" />
160166
<ColumnDefinition Width="Auto" />
161167
</Grid.ColumnDefinitions>
162168

163-
<!--content in the left of ScrollViewer, just default-->
164-
<ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
165-
CanContentScroll="{TemplateBinding CanContentScroll}"
166-
CanHorizontallyScroll="False"
167-
CanVerticallyScroll="False"
168-
ContentTemplate="{TemplateBinding ContentTemplate}"
169-
Content="{TemplateBinding Content}"
170-
Grid.Column="0"
171-
Margin="0"
172-
Grid.Row="0" />
169+
<!-- content in the left of ScrollViewer, just default -->
170+
<ScrollContentPresenter
171+
x:Name="PART_ScrollContentPresenter"
172+
Grid.Row="0"
173+
Grid.Column="0"
174+
Margin="0"
175+
CanContentScroll="{TemplateBinding CanContentScroll}"
176+
CanHorizontallyScroll="False"
177+
CanVerticallyScroll="False"
178+
Content="{TemplateBinding Content}"
179+
ContentTemplate="{TemplateBinding ContentTemplate}" />
173180

174-
<!--Scrollbar in thr rigth of ScrollViewer-->
175-
<ScrollBar x:Name="PART_VerticalScrollBar"
176-
AutomationProperties.AutomationId="VerticalScrollBar"
177-
Cursor="Arrow"
178-
Grid.Column="0"
179-
HorizontalAlignment="Right"
180-
Margin="0 0 0 0"
181-
Maximum="{TemplateBinding ScrollableHeight}"
182-
Minimum="0"
183-
Grid.Row="0"
184-
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
185-
Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
186-
ViewportSize="{TemplateBinding ViewportHeight}"
187-
Style="{DynamicResource ScrollBarStyle}" />
181+
<!-- Scrollbar in thr rigth of ScrollViewer -->
182+
<ScrollBar
183+
x:Name="PART_VerticalScrollBar"
184+
Grid.Row="0"
185+
Grid.Column="0"
186+
Margin="0,0,0,0"
187+
HorizontalAlignment="Right"
188+
AutomationProperties.AutomationId="VerticalScrollBar"
189+
Cursor="Arrow"
190+
Maximum="{TemplateBinding ScrollableHeight}"
191+
Minimum="0"
192+
Style="{DynamicResource ScrollBarStyle}"
193+
ViewportSize="{TemplateBinding ViewportHeight}"
194+
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
195+
Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
188196
</Grid>
189197
</ControlTemplate>
190198

191-
<!-- button style in the middle of the scrollbar -->
199+
<!-- button style in the middle of the scrollbar -->
192200
<Style x:Key="BaseThumbStyle" TargetType="{x:Type Thumb}">
193-
<Setter Property="SnapsToDevicePixels" Value="True"/>
194-
<Setter Property="OverridesDefaultStyle" Value="true"/>
195-
<Setter Property="IsTabStop" Value="false"/>
196-
<Setter Property="Focusable" Value="false"/>
201+
<Setter Property="SnapsToDevicePixels" Value="True" />
202+
<Setter Property="OverridesDefaultStyle" Value="true" />
203+
<Setter Property="IsTabStop" Value="false" />
204+
<Setter Property="Focusable" Value="false" />
197205
<Setter Property="Template">
198206
<Setter.Value>
199207
<ControlTemplate TargetType="{x:Type Thumb}">
200-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#898989" BorderBrush="Transparent" />
208+
<Border
209+
Background="#898989"
210+
BorderBrush="Transparent"
211+
CornerRadius="2"
212+
DockPanel.Dock="Right" />
201213
</ControlTemplate>
202214
</Setter.Value>
203215
</Setter>
@@ -207,25 +219,27 @@
207219
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
208220
<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
209221
<Setter Property="Background" Value="Black" />
210-
<!-- must set min width -->
211-
<Setter Property="MinWidth" Value="0"/>
212-
<Setter Property="Width" Value="5"/>
222+
<!-- must set min width -->
223+
<Setter Property="MinWidth" Value="0" />
224+
<Setter Property="Width" Value="5" />
213225
<Setter Property="Template">
214226
<Setter.Value>
215227
<ControlTemplate TargetType="{x:Type ScrollBar}">
216228
<DockPanel>
217-
<Track x:Name="PART_Track" IsDirectionReversed="true" DockPanel.Dock="Right">
229+
<Track
230+
x:Name="PART_Track"
231+
DockPanel.Dock="Right"
232+
IsDirectionReversed="true">
218233
<Track.Thumb>
219-
<Thumb Style="{DynamicResource ThumbStyle}"/>
234+
<Thumb Style="{DynamicResource ThumbStyle}" />
220235
</Track.Thumb>
221236
</Track>
222237
</DockPanel>
223238
</ControlTemplate>
224239
</Setter.Value>
225240
</Setter>
226241
</Style>
227-
<Style x:Key="BaseSeparatorStyle" TargetType="Rectangle">
228-
</Style>
242+
<Style x:Key="BaseSeparatorStyle" TargetType="Rectangle" />
229243
<Style x:Key="HighlightStyle">
230244
<Setter Property="Inline.FontWeight" Value="Bold" />
231245
</Style>
@@ -249,12 +263,12 @@
249263
<Style x:Key="BaseSearchIconPosition" TargetType="{x:Type Canvas}">
250264
<Setter Property="Width" Value="32" />
251265
<Setter Property="Height" Value="32" />
252-
<Setter Property="Margin" Value="0 2 18 0" />
266+
<Setter Property="Margin" Value="0,2,18,0" />
253267
<Setter Property="Background" Value="Transparent" />
254268
<Setter Property="HorizontalAlignment" Value="Right" />
255269
</Style>
256-
257-
<!--for classic themes-->
270+
271+
<!-- for classic themes -->
258272
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}">
259273
<Setter Property="Fill" Value="#555555" />
260274
<Setter Property="Width" Value="32" />
@@ -263,19 +277,24 @@
263277
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
264278
<Setter Property="Width" Value="32" />
265279
<Setter Property="Height" Value="32" />
266-
<Setter Property="Margin" Value="0 2 18 0" />
280+
<Setter Property="Margin" Value="0,2,18,0" />
267281
<Setter Property="Background" Value="Transparent" />
268282
<Setter Property="HorizontalAlignment" Value="Right" />
269283
</Style>
270-
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemHotkeyStyle}">
284+
<Style
285+
x:Key="ItemHotkeyStyle"
286+
BasedOn="{StaticResource BaseItemHotkeyStyle}"
287+
TargetType="{x:Type TextBlock}">
271288
<Setter Property="FontSize" Value="15" />
272289
<Setter Property="Foreground" Value="#8f8f8f" />
273290
<Setter Property="Opacity" Value="0.5" />
274291
</Style>
275-
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}">
292+
<Style
293+
x:Key="ItemHotkeySelectedStyle"
294+
BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
295+
TargetType="{x:Type TextBlock}">
276296
<Setter Property="FontSize" Value="15" />
277297
<Setter Property="Foreground" Value="#8f8f8f" />
278298
<Setter Property="Opacity" Value="0.5" />
279299
</Style>
280300
</ResourceDictionary>
281-

0 commit comments

Comments
 (0)