Skip to content

Commit 1ddab91

Browse files
Refactor OverlayPage and fix mouse pointer visibility
Co-authored-by: toniolo.luca <toniolo.luca@outlook.com>
1 parent 1d9e55f commit 1ddab91

1 file changed

Lines changed: 7 additions & 16 deletions

File tree

src/Captura/Pages/OverlayPage.xaml.cs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Captura
2222
{
2323
public partial class OverlayPage
2424
{
25-
public OverlayPage()
25+
OverlayPage()
2626
{
2727
InitializeComponent();
2828

@@ -37,24 +37,15 @@ public OverlayPage()
3737

3838
void AddToGrid(LayerFrame Frame, bool CanResize)
3939
{
40-
if (Grid == null)
41-
return;
42-
4340
Grid.Children.Add(Frame);
4441

4542
Panel.SetZIndex(Frame, 0);
4643

47-
// Wait for visual tree to be ready before accessing AdornerLayer
48-
Frame.Loaded += (s, e) =>
49-
{
50-
var layer = AdornerLayer.GetAdornerLayer(Frame);
51-
if (layer != null)
52-
{
53-
var adorner = new OverlayPositionAdorner(Frame, CanResize);
54-
layer.Add(adorner);
55-
adorner.PositionUpdated += Frame.RaisePositionChanged;
56-
}
57-
};
44+
var layer = AdornerLayer.GetAdornerLayer(Frame);
45+
var adorner = new OverlayPositionAdorner(Frame, CanResize);
46+
layer.Add(adorner);
47+
48+
adorner.PositionUpdated += Frame.RaisePositionChanged;
5849
}
5950

6051
LayerFrame Generate(PositionedOverlaySettings Settings, string Text, Color BackgroundColor)
@@ -387,7 +378,7 @@ bool IsOutsideGrid(Point Point)
387378

388379
void UIElement_OnMouseMove(object Sender, MouseEventArgs E)
389380
{
390-
if (ServiceProvider.Get<Settings>().MousePointerOverlay.DisplayHighlight)
381+
if (ServiceProvider.Get<Settings>().MousePointerOverlay.Display)
391382
MousePointer.Visibility = Visibility.Visible;
392383

393384
var position = E.GetPosition(Grid);

0 commit comments

Comments
 (0)