Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make use of the virtual method CreateControl on wpf DrawableHandler #2458

Merged
merged 3 commits into from
Apr 16, 2023
Merged

Make use of the virtual method CreateControl on wpf DrawableHandler #2458

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63df69b
Make use of the virtual method `CretaeControl` on wpf `DrawableHandler`
eng-myousif Apr 3, 2023
66299c0
Revert changes for `EtoMainCanvas` to be non generic again
eng-myousif Apr 3, 2023
d02c3ba
Remove unnecessary call for `CreateControl`
eng-myousif Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/Eto.Wpf/Forms/Controls/DrawableHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@

namespace Eto.Wpf.Forms.Controls
{
public class DrawableHandler : WpfPanel<swc.Canvas, Drawable, Drawable.ICallback>, Drawable.IHandler
public class DrawableHandler : DrawableHandler<swc.Canvas, Drawable, Drawable.ICallback> { }

public class DrawableHandler<TControl, TWidget, TCallback> : WpfPanel<TControl, TWidget, TCallback>, Drawable.IHandler
where TControl : swc.Canvas
where TWidget : Drawable
where TCallback : Drawable.ICallback
{
bool tiled;
sw.FrameworkElement content;
Expand Down Expand Up @@ -51,9 +56,9 @@ public Size TileSize
}
}

class EtoMainCanvas : swc.Canvas
public class EtoMainCanvas : swc.Canvas
{
public DrawableHandler Handler { get; set; }
public DrawableHandler<TControl, TWidget, TCallback> Handler { get; set; }

protected override void OnMouseDown(sw.Input.MouseButtonEventArgs e)
{
Expand Down Expand Up @@ -111,7 +116,7 @@ protected override sw.Size ArrangeOverride(sw.Size arrangeSize)
class EtoTile : sw.FrameworkElement
{
Rectangle bounds;
public DrawableHandler Handler { get; set; }
public DrawableHandler<TControl, TWidget, TCallback> Handler { get; set; }

public Rectangle Bounds
{
Expand Down Expand Up @@ -163,18 +168,26 @@ public override void OnUnLoad(EventArgs e)
UnRegisterScrollable();
}

public void Create()
protected override TControl CreateControl()
{
Control = new EtoMainCanvas
return new EtoMainCanvas
{
Handler = this,
SnapsToDevicePixels = true,
FocusVisualStyle = null,
Background = swm.Brushes.Transparent
};
} as TControl;
}

protected override void Initialize()
{
base.Initialize();

Control.Loaded += Control_Loaded;
}

public void Create() { }

public void Create(bool largeCanvas)
{
AllowTiling = largeCanvas;
Expand Down