File tree Expand file tree Collapse file tree 3 files changed +12
-6
lines changed Expand file tree Collapse file tree 3 files changed +12
-6
lines changed Original file line number Diff line number Diff line change 1103
1103
IsOpen =" {Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
1104
1104
Placement =" Bottom"
1105
1105
PlacementTarget =" {Binding ElementName=Background}"
1106
- PopupAnimation =" None" >
1106
+ PopupAnimation =" None"
1107
+ VerticalOffset =" -1" >
1107
1108
<Popup .PlacementRectangle>
1108
1109
<MultiBinding >
1109
1110
<MultiBinding .Converter>
1127
1128
CornerRadius =" {DynamicResource OverlayCornerRadius}" >
1128
1129
<Border
1129
1130
Padding =" {DynamicResource ComboBoxDropdownBorderPadding}"
1130
- BorderBrush =" {DynamicResource ComboBoxDropDownBorderBrush }"
1131
+ BorderBrush =" {DynamicResource CustomComboBorder }"
1131
1132
BorderThickness =" {DynamicResource ComboBoxDropdownBorderThickness}"
1132
1133
CornerRadius =" {Binding ElementName=PopupBorder, Path=CornerRadius}" >
1133
1134
<ScrollViewer
1157
1158
<!-- Pressed -->
1158
1159
<Trigger SourceName =" ToggleButton" Property =" IsPressed" Value =" True" >
1159
1160
<Setter TargetName =" Background" Property =" Background" Value =" {DynamicResource CustomComboPressedBG}" />
1160
- <Setter TargetName =" Background" Property =" BorderThickness" Value =" 0" />
1161
- <Setter TargetName =" Background" Property =" BorderBrush" Value =" {DynamicResource ComboBoxBorderBrushPressed }" />
1161
+ <Setter TargetName =" Background" Property =" BorderThickness" Value =" 0 0 0 1 " />
1162
+ <Setter TargetName =" Background" Property =" BorderBrush" Value =" {DynamicResource CustomComboPressedOutLine }" />
1162
1163
<Setter TargetName =" OutLine" Property =" BorderBrush" Value =" {DynamicResource CustomComboPressedOutLine}" />
1163
1164
<Setter TargetName =" OutLine" Property =" BorderThickness" Value =" {DynamicResource PressedCustomComboOutlineThickness}" />
1164
1165
<Setter TargetName =" ContentPresenter" Property =" TextElement.Foreground" Value =" {DynamicResource CustomComboPressedText}" />
Original file line number Diff line number Diff line change 159
159
<m : StaticResource x : Key =" CustomComboOutline" ResourceKey =" Color13B" />
160
160
<m : StaticResource x : Key =" CustomComboInline" ResourceKey =" Color21B" />
161
161
<m : StaticResource x : Key =" PopUpBorderBG" ResourceKey =" Color07B" />
162
+ <SolidColorBrush x : Key =" CustomComboBorder" Color =" #3f3f3f" />
162
163
<m : StaticResource x : Key =" CustomComboHoverBG" ResourceKey =" Color22B" />
163
164
<m : StaticResource x : Key =" CustomComboPressedBG" ResourceKey =" Color23B" />
164
165
<m : StaticResource x : Key =" CustomComboPressedOutLine" ResourceKey =" Color19B" />
171
172
172
173
<Thickness x : Key =" CustomComboOutlineThickness" >1,1,1,1</Thickness >
173
174
<Thickness x : Key =" CustomComboInlineThickness" >0,0,0,0</Thickness >
174
- <Thickness x : Key =" PressedCustomComboOutlineThickness" >1,1,1,1 </Thickness >
175
+ <Thickness x : Key =" PressedCustomComboOutlineThickness" >1,1,1,0 </Thickness >
175
176
<Thickness x : Key =" DisabledCustomComboOutlineThickness" >1,1,1,1</Thickness >
176
177
177
178
Original file line number Diff line number Diff line change 153
153
<m : StaticResource x : Key =" CustomComboOutline" ResourceKey =" Color13B" />
154
154
<m : StaticResource x : Key =" CustomComboInline" ResourceKey =" Color21B" />
155
155
<m : StaticResource x : Key =" PopUpBorderBG" ResourceKey =" Color07B" />
156
+ <SolidColorBrush
157
+ x : Key =" CustomComboBorder"
158
+ Opacity =" 0.14"
159
+ Color =" #000000" />
156
160
<m : StaticResource x : Key =" CustomComboHoverBG" ResourceKey =" Color07B" />
157
161
<m : StaticResource x : Key =" CustomComboPressedBG" ResourceKey =" Color07B" />
158
162
<m : StaticResource x : Key =" CustomComboPressedOutLine" ResourceKey =" Color13B" />
165
169
166
170
<Thickness x : Key =" CustomComboOutlineThickness" >1,1,1,0</Thickness >
167
171
<Thickness x : Key =" CustomComboInlineThickness" >0,0,0,2</Thickness >
168
- <Thickness x : Key =" PressedCustomComboOutlineThickness" >1,1,1,1 </Thickness >
172
+ <Thickness x : Key =" PressedCustomComboOutlineThickness" >1,1,1,0 </Thickness >
169
173
<Thickness x : Key =" DisabledCustomComboOutlineThickness" >1,1,1,1</Thickness >
170
174
171
175
You can’t perform that action at this time.
0 commit comments