Skip to content

Commit d82463d

Browse files
committed
Use linq methods in ThemePreviewer
1 parent 1de9db9 commit d82463d

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

src/Skia/ThemePreviewer.cs

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using SkiaSharp.Views.Desktop;
77
using System;
88
using System.IO;
9+
using System.Linq;
910
using System.Reflection;
1011
using System.Windows.Forms;
1112

@@ -154,16 +155,11 @@ protected override void OnMouseClick(MouseEventArgs e)
154155
}
155156

156157
// Check if carousel indicator was clicked
157-
if (renderer.CarouselIndicatorRects != null)
158+
var clickedIndex = Array.FindIndex(renderer.CarouselIndicatorRects ?? [], r => r.Contains(e.Location));
159+
if (clickedIndex != -1)
158160
{
159-
for (int i = 0; i < renderer.CarouselIndicatorRects.Length; i++)
160-
{
161-
if (renderer.CarouselIndicatorRects[i].Contains(e.Location))
162-
{
163-
ViewModel.SelectedIndex = i;
164-
return;
165-
}
166-
}
161+
ViewModel.SelectedIndex = clickedIndex;
162+
return;
167163
}
168164
}
169165

@@ -199,19 +195,7 @@ protected override void OnMouseMove(MouseEventArgs e)
199195
}
200196

201197
// Check carousel indicators for hand cursor
202-
bool isOverCarouselIndicator = false;
203-
if (renderer.CarouselIndicatorRects != null)
204-
{
205-
foreach (var rect in renderer.CarouselIndicatorRects)
206-
{
207-
if (rect.Contains(e.Location))
208-
{
209-
isOverCarouselIndicator = true;
210-
break;
211-
}
212-
}
213-
}
214-
198+
bool isOverCarouselIndicator = renderer.CarouselIndicatorRects?.Any(r => r.Contains(e.Location)) ?? false;
215199
bool isOverClickable = hoveredItem != HoveredItem.None || isOverCarouselIndicator;
216200
Cursor = isOverClickable ? Cursors.Hand : Cursors.Default;
217201

0 commit comments

Comments
 (0)