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 11031103 IsOpen =" {Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
11041104 Placement =" Bottom"
11051105 PlacementTarget =" {Binding ElementName=Background}"
1106- PopupAnimation =" None" >
1106+ PopupAnimation =" None"
1107+ VerticalOffset =" -1" >
11071108 <Popup .PlacementRectangle>
11081109 <MultiBinding >
11091110 <MultiBinding .Converter>
11271128 CornerRadius =" {DynamicResource OverlayCornerRadius}" >
11281129 <Border
11291130 Padding =" {DynamicResource ComboBoxDropdownBorderPadding}"
1130- BorderBrush =" {DynamicResource ComboBoxDropDownBorderBrush }"
1131+ BorderBrush =" {DynamicResource CustomComboBorder }"
11311132 BorderThickness =" {DynamicResource ComboBoxDropdownBorderThickness}"
11321133 CornerRadius =" {Binding ElementName=PopupBorder, Path=CornerRadius}" >
11331134 <ScrollViewer
11571158 <!-- Pressed -->
11581159 <Trigger SourceName =" ToggleButton" Property =" IsPressed" Value =" True" >
11591160 <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 }" />
11621163 <Setter TargetName =" OutLine" Property =" BorderBrush" Value =" {DynamicResource CustomComboPressedOutLine}" />
11631164 <Setter TargetName =" OutLine" Property =" BorderThickness" Value =" {DynamicResource PressedCustomComboOutlineThickness}" />
11641165 <Setter TargetName =" ContentPresenter" Property =" TextElement.Foreground" Value =" {DynamicResource CustomComboPressedText}" />
Original file line number Diff line number Diff line change 159159 <m : StaticResource x : Key =" CustomComboOutline" ResourceKey =" Color13B" />
160160 <m : StaticResource x : Key =" CustomComboInline" ResourceKey =" Color21B" />
161161 <m : StaticResource x : Key =" PopUpBorderBG" ResourceKey =" Color07B" />
162+ <SolidColorBrush x : Key =" CustomComboBorder" Color =" #3f3f3f" />
162163 <m : StaticResource x : Key =" CustomComboHoverBG" ResourceKey =" Color22B" />
163164 <m : StaticResource x : Key =" CustomComboPressedBG" ResourceKey =" Color23B" />
164165 <m : StaticResource x : Key =" CustomComboPressedOutLine" ResourceKey =" Color19B" />
171172
172173 <Thickness x : Key =" CustomComboOutlineThickness" >1,1,1,1</Thickness >
173174 <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 >
175176 <Thickness x : Key =" DisabledCustomComboOutlineThickness" >1,1,1,1</Thickness >
176177
177178
Original file line number Diff line number Diff line change 153153 <m : StaticResource x : Key =" CustomComboOutline" ResourceKey =" Color13B" />
154154 <m : StaticResource x : Key =" CustomComboInline" ResourceKey =" Color21B" />
155155 <m : StaticResource x : Key =" PopUpBorderBG" ResourceKey =" Color07B" />
156+ <SolidColorBrush
157+ x : Key =" CustomComboBorder"
158+ Opacity =" 0.14"
159+ Color =" #000000" />
156160 <m : StaticResource x : Key =" CustomComboHoverBG" ResourceKey =" Color07B" />
157161 <m : StaticResource x : Key =" CustomComboPressedBG" ResourceKey =" Color07B" />
158162 <m : StaticResource x : Key =" CustomComboPressedOutLine" ResourceKey =" Color13B" />
165169
166170 <Thickness x : Key =" CustomComboOutlineThickness" >1,1,1,0</Thickness >
167171 <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 >
169173 <Thickness x : Key =" DisabledCustomComboOutlineThickness" >1,1,1,1</Thickness >
170174
171175
You can’t perform that action at this time.
0 commit comments