From: jp <jp_bruyere@hotmail.com>
Date: Thu, 14 Apr 2016 10:16:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/ottd'
X-Git-Tag: v0.4~71
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=45fb721a432caec62068994ee9a56a4b843bcc03;p=jp%2Fcrow.git

Merge remote-tracking branch 'origin/ottd'
---

45fb721a432caec62068994ee9a56a4b843bcc03
diff --cc OTKCrow/OpenTKGameWindow.cs
index 8f1f0156,a073d695..a5ec72bd
--- a/OTKCrow/OpenTKGameWindow.cs
+++ b/OTKCrow/OpenTKGameWindow.cs
@@@ -183,8 -195,16 +183,12 @@@ namespace Cro
  		}
  		void OpenGLDraw()
  		{
 -			GL.GetInteger (GetPName.Viewport, viewport);
+ 			bool blend = GL.GetBoolean (GetPName.Blend);
 -
+ 			GL.Enable (EnableCap.Blend);
 -			GL.Viewport (0, 0, ClientRectangle.Width, ClientRectangle.Height);
+ 			GL.DepthMask (false);
+ 			GL.Disable (EnableCap.DepthTest);
  			shader.Enable ();
 +			GL.BindTexture (TextureTarget.Texture2D, texID);
  			lock (CrowInterface.RenderMutex) {
  				if (CrowInterface.IsDirty) {
  					GL.TexSubImage2D (TextureTarget.Texture2D, 0,
@@@ -194,8 -214,17 +198,13 @@@
  					CrowInterface.IsDirty = false;
  				}
  			}
 -
 -			uiQuad.Render (PrimitiveType.TriangleStrip);
 +			quad.Render (PrimitiveType.TriangleStrip);
  			GL.BindTexture(TextureTarget.Texture2D, 0);
 -
+ 			shader.Disable ();
+ 			if (!blend)
+ 				GL.Disable (EnableCap.Blend);
 -			GL.Viewport (viewport [0], viewport [1], viewport [2], viewport [3]);
 -
+ 			GL.DepthMask (true);
+ 			GL.Enable (EnableCap.DepthTest);
  		}
  		#endregion
  
diff --cc src/GraphicObjects/Window.cs
index 2bfa6921,94fe40d3..31e5da2f
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@@ -223,7 -214,12 +225,12 @@@ namespace Cro
  
  		protected void butQuitPress (object sender, MouseButtonEventArgs e)
  		{
 +			Interface.CurrentInterface.MouseCursor = XCursor.Default;
+ 			close ();
+ 		}
+ 
+ 		void close(){
+ 			Closing.Raise (this, null);
 -
  			Interface.CurrentInterface.DeleteWidget (this);
  		}