added option to allow popups when fullscreen window is not topmost

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@411 4f64403b-2f21-0410-a795-97e2b3489a10

3 files changed, 7 insertions, 23 deletions

diff --git a/yapp/YAPP.mdsp b/yapp/YAPP.mdsp
index df736d1..ba8a6f5 100644
--- a/yapp/YAPP.mdsp
+++ b/yapp/YAPP.mdsp
@@ -111,3 +111,4 @@ extraResourceOptions=
 2=version.rc

 [History]

 popups2.cpp,0

+message_pump.cpp,1231

diff --git a/yapp/message_pump.cpp b/yapp/message_pump.cpp
index 6b5bfb8..426d0ab 100644
--- a/yapp/message_pump.cpp
+++ b/yapp/message_pump.cpp
@@ -26,18 +26,8 @@ bool is_full_screen() {
 	hWnd = GetForegroundWindow();

 	if(hWnd && hWnd != GetDesktopWindow() && hWnd != GetShellWindow()) {

 		GetClientRect(hWnd, &ClientRect);

-		if ((ClientRect.right - ClientRect.left) >= w && (ClientRect.bottom - ClientRect.top) >= h) {

-			/*

-			{

-				TCHAR buf[512];

-				if(GetWindowText(hWnd, buf, 512))

-					PUShowMessageW(buf, SM_NOTIFY);

-				else

-					PUShowMessage("no title", SM_NOTIFY);

-			}

-			*/

+		if ((ClientRect.right - ClientRect.left) >= w && (ClientRect.bottom - ClientRect.top) >= h)

 			return true;

-		}

 	}

 	

 	// check other top level windows

@@ -45,23 +35,16 @@ bool is_full_screen() {
 		if(IsWindowVisible(hWnd) == 0 || IsIconic(hWnd) || hWnd == GetDesktopWindow() || hWnd == GetShellWindow())

 			continue;

 			

-		//if (!(GetWindowLong(hWnd, GWL_EXSTYLE) & WS_EX_TOPMOST))

-			//continue;

+		if(DBGetContactSettingByte(0, MODULE, "ShowForNonTopmostFullscreenWindows", 0) == 1) {

+			if (!(GetWindowLong(hWnd, GWL_EXSTYLE) & WS_EX_TOPMOST))

+				continue;

+		}

 

 		// not sure if this could be done more simply using 'IsZoomed'?

 		GetClientRect(hWnd, &ClientRect);

 		if ((ClientRect.right - ClientRect.left) < w || (ClientRect.bottom - ClientRect.top) < h)

 			continue;

 

-		/*

-		{

-			TCHAR buf[512];

-			if(GetWindowText(hWnd, buf, 512))

-				PUShowMessageW(buf, SM_NOTIFY);

-			else

-				PUShowMessage("no title", SM_NOTIFY);

-		}

-		*/

 		return true;

 	}

 

diff --git a/yapp/version.h b/yapp/version.h
index b64a581..e51ae7a 100644
--- a/yapp/version.h
+++ b/yapp/version.h
@@ -4,7 +4,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				5

 #define __RELEASE_NUM				0

-#define __BUILD_NUM					6

+#define __BUILD_NUM					7

 

 #define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM