From 50212bcb3bda68b5232013db579b92ef7966df35 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sun, 14 May 2017 20:49:46 +0000 Subject: [PATCH 1/3] Ensure "maximixed" is taken into account when updating window visibility on WM_SIZE (cherry picked from commit 5b8a164de14fe3de4c67b8348c10e2711f481cd5) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1800 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/mswin/fg_main_mswin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeglut/freeglut/src/mswin/fg_main_mswin.c b/freeglut/freeglut/src/mswin/fg_main_mswin.c index 20a635b..1958755 100644 --- a/freeglut/freeglut/src/mswin/fg_main_mswin.c +++ b/freeglut/freeglut/src/mswin/fg_main_mswin.c @@ -874,7 +874,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR /* Update visibility state of the window */ if (wParam==SIZE_MINIMIZED) fghPlatformOnWindowStatusNotify(window,GL_FALSE,GL_FALSE); - else if (wParam==SIZE_RESTORED && !window->State.Visible) + else if ((wParam==SIZE_RESTORED || wParam == SIZE_MAXIMIZED) && !window->State.Visible) fghPlatformOnWindowStatusNotify(window,GL_TRUE,GL_FALSE); /* Check window visible, we don't want do anything when we get a WM_SIZE because the user or glutIconifyWindow minimized the window */ From d7425510d391cf01ad782378944ae48af1b3c004 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sun, 14 May 2017 20:49:53 +0000 Subject: [PATCH 2/3] updated text on main website page regarding license of FreeGLUT (reverted from commit 174bd482907f828f7b9a20622b3680400b70aba3) (cherry picked from commit 5488acab3802fa5129acbe570653e9a04208e3cc) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1801 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/web-src/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeglut/web-src/index.php b/freeglut/web-src/index.php index fa6abc9..f45727a 100644 --- a/freeglut/web-src/index.php +++ b/freeglut/web-src/index.php @@ -27,7 +27,7 @@ widely available and highly portable.

required for creating windows, initializing OpenGL contexts, and handling input events, to allow for trully portable OpenGL programs.

-

FreeGLUT is released under a license equivalent to the X-Consortium license.

+

FreeGLUT is released under the X-Consortium license.

Why?
From f9acc7969084add8aecea75c4b907801fac75464 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sun, 14 May 2017 20:52:19 +0000 Subject: [PATCH 3/3] Update README.md bit more logical ordering of content (cherry picked from commit 6cb86e9657e6f21fd0397cf3972403466b772ae0) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1802 7f0cb862-5218-0410-a997-914c9d46530a --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1d19af6..12289ef 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,13 @@ This readme file applies to the git clone of FreeGLUT's svn repo on [sourceforge Every effort is made to ensure that the ``git_master`` branch only progresses in a fastforward manner, but complete guarantees cannot be given as the [sourceforge.net trunk](https://sourceforge.net/p/freeglut/code/HEAD/tree/) is at all times leading. -This copy of the svn repository was not created with ``git svn`` but with the excellent svn support of [SmartGit](http://www.syntevo.com/). Basic workflow upon receiving a pull request is as follows: +I will be unable to merge a pull request if the github clone is behind ``svn/trunk`` on sourceforge.net. Should you detect this, please contact me, maybe through making an issue here on github. + +This copy of the svn repository was not created with ``git svn`` but with the excellent svn support of [SmartGit](http://www.syntevo.com/). + + +Notes to self on how to work with this: + Basic workflow upon receiving a pull request is as follows: - Merge pull request on github - pull in changes to my local clone of the ``git_master`` branch. - cherry pick the merged commits onto my local clone of the ``svn/trunk`` branch @@ -13,5 +19,3 @@ This copy of the svn repository was not created with ``git svn`` but with the ex ``svn/trunk`` clone as extra meta data is added) - merge ``svn/trunk`` into local ``git_master`` - push merge commit to github (its fast forward!) - -I will be unable to merge a pull request if the github clone is behind ``svn/trunk`` on sourceforge.net. Should you detect this, please contact me, maybe through making an issue here on github.