compute width rather than use right/bottom edges as width

Author: JeffryBooher

appshell/cef_dark_aero_window.cpp

@@ -517,18 +517,18 @@ BOOL cef_dark_aero_window::HandleNcMouseMove(UINT uHitTest, LPPOINT pt)
 // WM_GETMINMAXINFO handler
 BOOL cef_dark_aero_window::HandleGetMinMaxInfo(LPMINMAXINFO mmi)
 {
-    if (CanUseAeroGlass()) {
-        HMONITOR hm = ::MonitorFromWindow(mWnd, MONITOR_DEFAULTTONEAREST);
-        MONITORINFO mi = {0};
-        mi.cbSize = sizeof (mi);
+	if (CanUseAeroGlass()) {
+		HMONITOR hm = ::MonitorFromWindow(mWnd, MONITOR_DEFAULTTONEAREST);
+		MONITORINFO mi = {0};
+		mi.cbSize = sizeof (mi);
 
-        ::GetMonitorInfo(hm, &mi);
+		::GetMonitorInfo(hm, &mi);
+		mmi->ptMaxSize.x = ::RectWidth(mi.rcWork) + ::kWindowFrameSize;	
+		mmi->ptMaxSize.y = ::RectHeight(mi.rcWork) + ::kWindowFrameSize;
 
-        mmi->ptMaxSize.x = mi.rcWork.right + ::kWindowFrameSize;
-        mmi->ptMaxSize.y = mi.rcWork.bottom + ::kWindowFrameSize;
-        mmi->ptMaxPosition.x = -::kWindowFrameSize;
-        mmi->ptMaxPosition.y = -::kWindowFrameSize;
-    }
+		mmi->ptMaxPosition.x = -::kWindowFrameSize;
+		mmi->ptMaxPosition.y = -::kWindowFrameSize;
+	}
 
     return TRUE;
 }

appshell/cef_window.h

@@ -28,16 +28,47 @@ class cef_window;
 class cef_menu;
 
 // RECT helpers
-static __inline int RectWidth(const RECT &r) { return r.right - r.left; }
-static __inline int RectHeight(const RECT &r) { return r.bottom - r.top; }
-
 static __inline void RectSwapLeftRight(RECT &r) 
 {
     LONG temp = r.left;
     r.left = r.right;
     r.right = temp;
 }
 
+static __inline void NormalizeRect(RECT& r) 
+{
+	int nTemp;
+	if (r.left > r.right)
+	{
+		nTemp = r.left;
+		r.left = r.right;
+		r.right = nTemp;
+	}
+	if (r.top > r.bottom)
+	{
+		nTemp = r.top;
+		r.top = r.bottom;
+		r.bottom = nTemp;
+	}
+}
+
+static __inline int RectWidth(const RECT &rIn) 
+{ 
+	RECT r;
+	::CopyRect(&r, &rIn);
+	::NormalizeRect(r);
+	return r.right - r.left; 
+}
+
+static __inline int RectHeight(const RECT &rIn) 
+{ 
+	RECT r;
+	::CopyRect(&r, &rIn);
+	::NormalizeRect(r);
+	return r.bottom - r.top; 
+}
+
+
 // Undocumented Flags for GetDCEx()
 #ifndef DCX_USESTYLE
 #define DCX_USESTYLE 0x00010000