Skip to content

Commit 40c1767

Browse files
apmanapman
authored
[MacOS Theme] Fix various Textbox issues (#85)
1 parent 27ca75f commit 40c1767

File tree

4 files changed

+122
-114
lines changed

4 files changed

+122
-114
lines changed

‎samples/SampleApp/App.axaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<Application.Styles>
66
<!-- <FluentTheme /> -->
7-
<!-- <StyleInclude Source="avares://MacOS.Avalonia.Theme/MacOSTheme.axaml" /> -->
8-
<StyleInclude Source="avares://DevExpress.Avalonia.Theme/DevExpressTheme.axaml" />
7+
<StyleInclude Source="avares://MacOS.Avalonia.Theme/MacOSTheme.axaml" />
8+
<!-- <StyleInclude Source="avares://DevExpress.Avalonia.Theme/DevExpressTheme.axaml" /> -->
99
<StyleInclude Source="/Styles.axaml" />
1010
</Application.Styles>
1111
</Application>

‎samples/SampleApp/DemoPages/TextBoxDemo.axaml

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@
3333
<TextBox Watermark="Disabled" IsEnabled="False" />
3434
<TextBox PasswordChar="*" Classes="revealPasswordButton">Reveal Password</TextBox>
3535
<TextBox PasswordChar="*" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
36+
<TextBlock>Custom Height:</TextBlock>
37+
<StackPanel Orientation="Horizontal">
38+
<TextBox Watermark="Type here" Height="30" Width="250" VerticalContentAlignment="Center" />
39+
<Button Content="..." Height="30" Width="30" />
40+
</StackPanel>
3641
</StackPanel>
3742
</Border>
3843
</ScrollViewer>

‎src/MacOS.Avalonia.Theme/Accents/ThemeResources.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
<Thickness x:Key="BorderThickness">1</Thickness>
235235

236236
<x:Double x:Key="ControlFontSize">13</x:Double>
237-
<x:Double x:Key="PasswordHiddenFontSize">8</x:Double>
237+
<x:Double x:Key="PasswordHiddenFontSize">11</x:Double>
238238

239239
<SolidColorBrush x:Key="TransparentBrush" Color="Transparent" />
240240

‎src/MacOS.Avalonia.Theme/Controls/TextBox.axaml

+114-111
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,34 @@
66
</ResourceDictionary.MergedDictionaries>
77

88
<Design.PreviewWith>
9-
<ThemeVariantScope RequestedThemeVariant="Dark">
10-
<Border Background="#212121">
11-
<Border Background="{DynamicResource LayoutBackgroundLowBrush}">
12-
<StackPanel Margin="20" Width="300" Spacing="10" HorizontalAlignment="Left">
13-
<TextBlock>Name:</TextBlock>
14-
<TextBox Watermark="Enter your name">MyServer</TextBox>
15-
<TextBlock>Password:</TextBlock>
16-
<TextBox PasswordChar="*" Watermark="Enter your password" />
17-
<TextBlock>Notes:</TextBlock>
18-
<TextBox Height="100" AcceptsReturn="True" TextWrapping="Wrap" />
19-
<TextBox InnerLeftContent="http://" />
20-
<TextBox InnerRightContent=".com" />
21-
<TextBox
22-
InnerLeftContent="http://"
23-
InnerRightContent=".com" />
24-
<TextBox Classes="clearButton">With 'Clear' button</TextBox>
25-
<TextBox Watermark="Enter your name" IsEnabled="False" />
26-
<TextBox PasswordChar="•" Classes="revealPasswordButton">Reveal Password</TextBox>
27-
<TextBox PasswordChar="•" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
9+
<!-- <ThemeVariantScope RequestedThemeVariant="Dark"> -->
10+
<Border Background="#f0f0f0">
11+
<Border Background="{DynamicResource LayoutBackgroundLowBrush}">
12+
<StackPanel Margin="20" Width="300" Spacing="10" HorizontalAlignment="Left">
13+
<TextBlock>Name:</TextBlock>
14+
<TextBox Watermark="Enter your name">MyServer</TextBox>
15+
<TextBlock>Password:</TextBlock>
16+
<TextBox PasswordChar="*" Watermark="Enter your password" />
17+
<TextBlock>Notes:</TextBlock>
18+
<TextBox Height="100" AcceptsReturn="True" TextWrapping="Wrap" />
19+
<TextBox InnerLeftContent="http://" />
20+
<TextBox InnerRightContent=".com" />
21+
<TextBox
22+
InnerLeftContent="http://"
23+
InnerRightContent=".com" />
24+
<TextBox Classes="clearButton">With 'Clear' button</TextBox>
25+
<TextBox Watermark="Enter your name" IsEnabled="False" />
26+
<TextBox PasswordChar="•" Classes="revealPasswordButton">Reveal Password</TextBox>
27+
<TextBox PasswordChar="•" Classes="revealPasswordButton" RevealPassword="True">Password Revealed</TextBox>
28+
<TextBlock>Custom Height:</TextBlock>
29+
<StackPanel Orientation="Horizontal">
30+
<TextBox Watermark="Type here" Height="30" Width="250" VerticalContentAlignment="Center" />
31+
<Button Content="..." Height="30" Width="30" />
2832
</StackPanel>
29-
</Border>
33+
</StackPanel>
3034
</Border>
31-
</ThemeVariantScope>
35+
</Border>
36+
<!-- </ThemeVariantScope> -->
3237
</Design.PreviewWith>
3338

3439
<MenuFlyout x:Key="DefaultTextBoxContextFlyout">
@@ -116,93 +121,94 @@
116121
<ControlTemplate>
117122
<DataValidationErrors>
118123
<Panel>
119-
<Border Name="FocusBorderElement"
120-
CornerRadius="3"
121-
Padding="3">
122-
<Border Name="PART_BorderElement"
123-
BorderThickness="1"
124-
BorderBrush="Transparent"
125-
BoxShadow="{DynamicResource TextBoxBorderShadows}"
126-
Background="{TemplateBinding Background}">
127-
<Grid ColumnDefinitions="Auto,*,Auto">
128-
<ContentPresenter Name="PrefixContent"
129-
Grid.Column="0"
130-
Content="{TemplateBinding InnerLeftContent}"
131-
Padding="3 2 3 1">
132-
<ContentPresenter.IsVisible>
133-
<Binding RelativeSource="{RelativeSource Self}" Path="Content"
134-
Converter="{x:Static StringConverters.IsNotNullOrEmpty}" />
135-
</ContentPresenter.IsVisible>
136-
</ContentPresenter>
137-
<DockPanel Name="PART_InnerDockPanel"
138-
Grid.Column="1"
139-
Margin="2 2 3 1 ">
140-
<ScrollViewer Name="PART_ScrollViewer"
141-
Margin="0 0 -4 0"
142-
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
143-
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
144-
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
145-
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
146-
BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}">
147-
<Panel>
148-
<TextBlock Name="PART_Watermark"
149-
Foreground="{DynamicResource ForegroundLowBrush}"
150-
FontSize="{DynamicResource ControlFontSize}"
151-
Text="{TemplateBinding Watermark}"
152-
TextAlignment="{TemplateBinding TextAlignment}"
153-
TextWrapping="{TemplateBinding TextWrapping}"
154-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
155-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
156-
<TextBlock.IsVisible>
157-
<MultiBinding Converter="{x:Static BoolConverters.And}">
158-
<Binding ElementName="PART_TextPresenter" Path="PreeditText"
159-
Converter="{x:Static StringConverters.IsNullOrEmpty}" />
160-
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text"
161-
Converter="{x:Static StringConverters.IsNullOrEmpty}" />
162-
</MultiBinding>
163-
</TextBlock.IsVisible>
164-
</TextBlock>
165-
<TextPresenter Name="PART_TextPresenter"
166-
Text="{TemplateBinding Text, Mode=TwoWay}"
167-
CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
168-
CaretIndex="{TemplateBinding CaretIndex}"
169-
SelectionStart="{TemplateBinding SelectionStart}"
170-
SelectionEnd="{TemplateBinding SelectionEnd}"
171-
TextAlignment="{TemplateBinding TextAlignment}"
172-
TextWrapping="{TemplateBinding TextWrapping}"
173-
LineHeight="{TemplateBinding LineHeight}"
174-
LetterSpacing="{TemplateBinding LetterSpacing}"
175-
RevealPassword="{TemplateBinding RevealPassword}"
176-
SelectionBrush="{TemplateBinding SelectionBrush}"
177-
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
178-
CaretBrush="{TemplateBinding CaretBrush}"
179-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
180-
VerticalAlignment="Center">
181-
<TextPresenter.PasswordChar>
182-
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="PasswordChar"
183-
Converter="{StaticResource CharToMacOsPasswordCharConverter}" />
184-
</TextPresenter.PasswordChar>
185-
</TextPresenter>
186-
</Panel>
187-
<ScrollViewer.Styles>
188-
<Style Selector="ScrollContentPresenter#PART_ContentPresenter">
189-
<Setter Property="Cursor" Value="IBeam" />
190-
</Style>
191-
</ScrollViewer.Styles>
192-
</ScrollViewer>
193-
</DockPanel>
194-
<ContentPresenter Name="SuffixContent"
195-
Grid.Column="2"
196-
Padding="3 2 3 1"
197-
Content="{TemplateBinding InnerRightContent}">
198-
<ContentPresenter.IsVisible>
199-
<Binding RelativeSource="{RelativeSource Self}" Path="Content"
200-
Converter="{x:Static StringConverters.IsNotNullOrEmpty}" />
201-
</ContentPresenter.IsVisible>
202-
</ContentPresenter>
203-
</Grid>
204-
</Border>
124+
<Border Name="PART_BorderElement"
125+
Height="{TemplateBinding Height}"
126+
BorderThickness="1"
127+
BorderBrush="Transparent"
128+
BoxShadow="{DynamicResource TextBoxBorderShadows}"
129+
Background="{TemplateBinding Background}">
130+
<Grid ColumnDefinitions="Auto,*,Auto">
131+
<ContentPresenter Name="PrefixContent"
132+
Grid.Column="0"
133+
Content="{TemplateBinding InnerLeftContent}"
134+
Padding="3 2 3 1">
135+
<ContentPresenter.IsVisible>
136+
<Binding RelativeSource="{RelativeSource Self}" Path="Content"
137+
Converter="{x:Static StringConverters.IsNotNullOrEmpty}" />
138+
</ContentPresenter.IsVisible>
139+
</ContentPresenter>
140+
<DockPanel Name="PART_InnerDockPanel"
141+
Grid.Column="1"
142+
Margin="2 2 3 1 ">
143+
<ScrollViewer Name="PART_ScrollViewer"
144+
Margin="0 0 -4 0"
145+
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
146+
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"
147+
IsScrollChainingEnabled="{TemplateBinding (ScrollViewer.IsScrollChainingEnabled)}"
148+
AllowAutoHide="{TemplateBinding (ScrollViewer.AllowAutoHide)}"
149+
BringIntoViewOnFocusChange="{TemplateBinding (ScrollViewer.BringIntoViewOnFocusChange)}">
150+
<Panel>
151+
<TextBlock Name="PART_Watermark"
152+
Foreground="{DynamicResource ForegroundLowBrush}"
153+
FontSize="{DynamicResource ControlFontSize}"
154+
Text="{TemplateBinding Watermark}"
155+
TextAlignment="{TemplateBinding TextAlignment}"
156+
TextWrapping="{TemplateBinding TextWrapping}"
157+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
158+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
159+
<TextBlock.IsVisible>
160+
<MultiBinding Converter="{x:Static BoolConverters.And}">
161+
<Binding ElementName="PART_TextPresenter" Path="PreeditText"
162+
Converter="{x:Static StringConverters.IsNullOrEmpty}" />
163+
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text"
164+
Converter="{x:Static StringConverters.IsNullOrEmpty}" />
165+
</MultiBinding>
166+
</TextBlock.IsVisible>
167+
</TextBlock>
168+
<TextPresenter Name="PART_TextPresenter"
169+
Text="{TemplateBinding Text, Mode=TwoWay}"
170+
CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
171+
CaretIndex="{TemplateBinding CaretIndex}"
172+
SelectionStart="{TemplateBinding SelectionStart}"
173+
SelectionEnd="{TemplateBinding SelectionEnd}"
174+
TextAlignment="{TemplateBinding TextAlignment}"
175+
TextWrapping="{TemplateBinding TextWrapping}"
176+
LineHeight="{TemplateBinding LineHeight}"
177+
LetterSpacing="{TemplateBinding LetterSpacing}"
178+
RevealPassword="{TemplateBinding RevealPassword}"
179+
SelectionBrush="{TemplateBinding SelectionBrush}"
180+
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
181+
CaretBrush="{TemplateBinding CaretBrush}"
182+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
183+
VerticalAlignment="Center">
184+
<TextPresenter.PasswordChar>
185+
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="PasswordChar"
186+
Converter="{StaticResource CharToMacOsPasswordCharConverter}" />
187+
</TextPresenter.PasswordChar>
188+
</TextPresenter>
189+
</Panel>
190+
<ScrollViewer.Styles>
191+
<Style Selector="ScrollContentPresenter#PART_ContentPresenter">
192+
<Setter Property="Cursor" Value="IBeam" />
193+
</Style>
194+
</ScrollViewer.Styles>
195+
</ScrollViewer>
196+
</DockPanel>
197+
<ContentPresenter Name="SuffixContent"
198+
Grid.Column="2"
199+
Padding="3 2 3 1"
200+
Content="{TemplateBinding InnerRightContent}">
201+
<ContentPresenter.IsVisible>
202+
<Binding RelativeSource="{RelativeSource Self}" Path="Content"
203+
Converter="{x:Static StringConverters.IsNotNullOrEmpty}" />
204+
</ContentPresenter.IsVisible>
205+
</ContentPresenter>
206+
</Grid>
205207
</Border>
208+
<Border Name="FocusBorderElement"
209+
Height="{TemplateBinding Height}"
210+
BorderThickness="3"
211+
CornerRadius="3" />
206212
</Panel>
207213
</DataValidationErrors>
208214
</ControlTemplate>
@@ -219,11 +225,8 @@
219225

220226
<!-- Focused State -->
221227
<Style Selector="^:focus">
222-
<Style Selector="^ /template/ DockPanel#PART_InnerDockPanel">
223-
<Setter Property="Margin" Value="2 1 3 0 " />
224-
</Style>
225228
<Style Selector="^ /template/ Border#FocusBorderElement">
226-
<Setter Property="Background" Value="{DynamicResource TextBoxBorderFocusBrush}" />
229+
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderFocusBrush}" />
227230
</Style>
228231
</Style>
229232

0 commit comments

Comments
 (0)