@@ -93,27 +93,27 @@ FReply SWColorWheel::OnMouseMove(const FGeometry& MyGeometry, const FPointerEven
9393
9494int32 SWColorWheel::OnPaint (const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
9595{
96- const ESlateDrawEffect DrawEffects = ShouldBeEnabled (bParentEnabled) ? ESlateDrawEffect::None : ESlateDrawEffect::DisabledEffect;
97- const FVector2D CircleSize = AllottedGeometry.GetLocalSize () - SelectorImage->ImageSize ;
98-
99- // Draw the Color Wheel image
96+ const bool bIsEnabled = ShouldBeEnabled (bParentEnabled);
97+ const ESlateDrawEffect DrawEffects = bIsEnabled ? ESlateDrawEffect::None : ESlateDrawEffect::DisabledEffect;
98+ const FVector2f SelectorSize = SelectorImage->ImageSize ;
99+ const FVector2f CircleSize = AllottedGeometry.GetLocalSize () - SelectorSize;
100+
100101 FSlateDrawElement::MakeBox (
101102 OutDrawElements,
102103 LayerId,
103- AllottedGeometry.ToPaintGeometry (0.5 * SelectorImage-> ImageSize , CircleSize ),
104+ AllottedGeometry.ToPaintGeometry (CircleSize, FSlateLayoutTransform ( 0 . 5f * SelectorSize) ),
104105 Image,
105106 DrawEffects,
106- InWidgetStyle.GetColorAndOpacityTint () * HueCircleColorAndOpacity. Get (). GetColor (InWidgetStyle) * Image->GetTint (InWidgetStyle)
107+ InWidgetStyle.GetColorAndOpacityTint () * Image->GetTint (InWidgetStyle)
107108 );
108109
109- // Draw the Pin
110110 FSlateDrawElement::MakeBox (
111111 OutDrawElements,
112112 LayerId + 1 ,
113- AllottedGeometry.ToPaintGeometry (0 .5f * (AllottedGeometry.GetLocalSize () + CalcRelativePositionFromCenter () * CircleSize - SelectorImage-> ImageSize ), SelectorImage-> ImageSize ),
113+ AllottedGeometry.ToPaintGeometry (SelectorSize, FSlateLayoutTransform ( 0 .5f * (AllottedGeometry.GetLocalSize () + CalcRelativePositionFromCenter () * FVector2D ( CircleSize - SelectorSize))) ),
114114 SelectorImage,
115115 DrawEffects,
116- InWidgetStyle.GetColorAndOpacityTint () * PinColorAndOpacity. Get (). GetColor (InWidgetStyle) * SelectorImage->GetTint (InWidgetStyle)
116+ InWidgetStyle.GetColorAndOpacityTint () * SelectorImage->GetTint (InWidgetStyle)
117117 );
118118
119119 return LayerId + 1 ;
0 commit comments