Merge pull request #32 from picoe/curtis/wpf-fix-drawing

Wpf/WinForms: Fix initial draw of viewport in some cases.
picoe · Aug 8, 2019 · 5f47a3c · 5f47a3c
2 parents 1944fef + 8c85263
commit 5f47a3c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 30 deletions.
diff --git a/Eto.OpenTK.WinForms/WinGLUserControl.cs b/Eto.OpenTK.WinForms/WinGLUserControl.cs
@@ -217,11 +217,12 @@ protected override void OnHandleDestroyed(EventArgs e)
         protected override void OnPaint(PaintEventArgs e)
         {
             EnsureValidHandle();
+            if (context != null)
+            {
+                context.Update(windowInfo);
+            }
 
             base.OnPaint(e);
-
-            // prompt view to update when it is repainted
-            OnResize(EventArgs.Empty);
         }
 
         /// <summary>

diff --git a/Eto.OpenTK.Wpf/WpfWinGLSurfaceHandler.cs b/Eto.OpenTK.Wpf/WpfWinGLSurfaceHandler.cs
@@ -17,6 +17,8 @@ public class WpfWinGLSurfaceHandler : WindowsFormsHostHandler<WinGLUserControl,
         public void CreateWithParams(GraphicsMode mode, int major, int minor, GraphicsContextFlags flags)
         {
             WinFormsControl = new WinGLUserControl(mode, major, minor, flags);
+            Control.Focusable = true;
+            Control.Background = System.Windows.SystemColors.ControlBrush;
         }
 
         protected override void Initialize()
@@ -25,29 +27,15 @@ protected override void Initialize()
             HandleEvent(GLSurface.GLDrawEvent);
         }
 
-        public bool IsInitialized
-        {
-            get { return Control.IsInitialized; }
-        }
+        public bool IsInitialized => WinFormsControl.IsInitialized;
 
-        public void MakeCurrent()
-        {
-            WinFormsControl.MakeCurrent();
-        }
+        public void MakeCurrent() => WinFormsControl.MakeCurrent();
 
-        public void SwapBuffers()
-        {
-            WinFormsControl.SwapBuffers();
-        }
-
-        public void updateViewHandler(object sender, EventArgs e)
-        {
-            updateView();
-        }
+        public void SwapBuffers() => WinFormsControl.SwapBuffers();
 
-        public void updateView()
+        public void UpdateView()
         {
-            if (!Control.IsInitialized)
+            if (!WinFormsControl.IsInitialized)
                 return;
 
             MakeCurrent();
@@ -68,12 +56,8 @@ public override void AttachEvent(string id)
                     WinFormsControl.ShuttingDown += (sender, e) => Callback.OnShuttingDown(Widget, e);
                     break;
 
-                case GLSurface.ShownEvent:
-                case GLSurface.SizeChangedEvent:
                 case GLSurface.GLDrawEvent:
-                    WinFormsControl.SizeChanged += updateViewHandler;
-                    WinFormsControl.Paint += updateViewHandler;
-                    //Control.Resize += (sender, e) => Callback.OnDraw(Widget, EventArgs.Empty);
+                    WinFormsControl.Paint += (sender, e) => UpdateView();
                     break;
 
                 default:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,9 +1,8 @@
-variables:
+variables:
   solution: 'Eto.OpenTK.sln'
-  build.version: '0.1.0-ci-$(Build.BuildNumber)'
+  build.version: '0.1.2-ci-$(Build.BuildNumber)'
   build.configuration: 'Release'
   build.arguments: /restore /t:Build;Pack /p:BuildVersion=$(build.version) /p:BuildBranch=$(Build.SourceBranch)
-
 
 trigger:
   - master