Merge commit '4ae7596e'

highperformancecoder · Jan 16, 2024 · fa93759 · fa93759
2 parents 5ce1e7e + 4ae7596
commit fa93759
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/gui-js/libs/shared/src/lib/constants/version.ts b/gui-js/libs/shared/src/lib/constants/version.ts
@@ -1 +1 @@
-export const version="3.2.0-beta.1";
+export const version="3.2.0-beta.2";
diff --git a/gui-js/package-lock.json b/gui-js/package-lock.json
diff --git a/gui-js/package.json b/gui-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minsky",
-  "version":"3.2.0-beta.1",
+  "version":"3.2.0-beta.2",
   "author": "High Performance Coders",
   "description": "Graphical dynamical systems simulator oriented towards economics",
   "build": {

diff --git a/minskyVersion.h b/minskyVersion.h
@@ -1 +1 @@
-#define MINSKY_VERSION "3.2.0-beta.1"
+#define MINSKY_VERSION "3.2.0-beta.2"
diff --git a/model/windowInformation.cc b/model/windowInformation.cc
@@ -56,7 +56,6 @@ using namespace ecolab;
 
 namespace minsky
 {
-
   namespace
   {
 #ifdef USE_WIN32_SURFACE
@@ -101,10 +100,10 @@ namespace minsky
     SelectObject(hdcMem, hOld);
     DeleteObject(hbmMem);
     DeleteDC(hdcMem);
-    DestroyWindow(childWindowId);
+    SetWindowLongPtrA(childWindowId, GWLP_USERDATA, 0);
+    PostMessageA(childWindowId,WM_CLOSE,0,0);
 #elif defined(MAC_OSX_TK)
 #elif defined(USE_X11)
-    //eventThread.reset(); //shut thread down before destroying window
     XFreeGC(display, graphicsContext);
     XDestroyWindow(display, childWindowId);
     XDestroyWindow(display, bufferWindowId);
@@ -160,10 +159,10 @@ namespace minsky
 #ifdef USE_WIN32_SURFACE
   LRESULT CALLBACK windowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
   {
-    WindowInformation* winfo=reinterpret_cast<WindowInformation*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
     switch (msg)
       {
       case WM_PAINT:
+        if (WindowInformation* winfo=reinterpret_cast<WindowInformation*>(GetWindowLongPtr(hwnd, GWLP_USERDATA)))
         {
           RECT r;
           if (GetUpdateRect(hwnd,&r,false))
@@ -243,7 +242,7 @@ namespace minsky
         // adjust everything by the monitor scale factor
         DEVICE_SCALE_FACTOR scaleFactor;
         GetScaleFactorForMonitor(MonitorFromWindow(parentWindowId, MONITOR_DEFAULTTONEAREST), &scaleFactor);
-        sf=scaleFactor/100.0;
+        sf=int(scaleFactor)/100.0;
       }
     if (sf>0)
       {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const version="3.2.0-beta.1";
		export const version="3.2.0-beta.2";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define MINSKY_VERSION "3.2.0-beta.1"
		#define MINSKY_VERSION "3.2.0-beta.2"