版本号更新等

zhongyang219 · May 13, 2018 · 7f8032b · 7f8032b
1 parent 6733efb
commit 7f8032b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/TrafficMonitor/TrafficMonitor.rc b/TrafficMonitor/TrafficMonitor.rc
diff --git a/TrafficMonitor/TrafficMonitorDlg.cpp b/TrafficMonitor/TrafficMonitorDlg.cpp
@@ -386,13 +386,23 @@ void CTrafficMonitorDlg::SetTransparency(int transparency)
 
 void CTrafficMonitorDlg::SetAlwaysOnTop()
 {
-	if (!m_is_foreground_fullscreen || (m_is_foreground_fullscreen && !theApp.m_main_wnd_data.hide_main_wnd_when_fullscreen))
-	{
-		if (m_always_on_top)
-			SetWindowPos(&wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);			//设置置顶
-		else
-			SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);		//取消置顶
-	}
+	//if (!m_is_foreground_fullscreen || (m_is_foreground_fullscreen && !theApp.m_main_wnd_data.hide_main_wnd_when_fullscreen))
+	//{
+	//	if (m_always_on_top)
+	//		SetWindowPos(&wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);			//设置置顶
+	//	else
+	//		SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);		//取消置顶
+	//}
+	if (theApp.m_hide_main_window)
+		return;
+	else if (theApp.m_main_wnd_data.hide_main_wnd_when_fullscreen && m_is_foreground_fullscreen)		//当设置有程序全屏时隐藏悬浮窗且有程序在全屏运行时，不执行置顶操作
+		return;
+
+	if (m_always_on_top)
+		SetWindowPos(&wndTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);			//设置置顶
+	else
+		SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);		//取消置顶
+
 }
 
 void CTrafficMonitorDlg::SetMousePenetrate()

diff --git a/TrafficMonitor/stdafx.h b/TrafficMonitor/stdafx.h
@@ -80,8 +80,8 @@ using std::ofstream;
 
 #define MAX_INSERT_TO_TASKBAR_CNT 5		//尝试嵌入任务栏的最大次数
 
-#define VERSION L"1.72"
-#define COMPILE_DATE L"2018/04/21"
+#define VERSION L"1.73"
+#define COMPILE_DATE L"2018/05/13"
 
 #define MAX_NOTIFY_ICON 4		//可选的通知区图标数量