Skip to content

Commit 641bff4

Browse files
committed
修正通过任务栏窗口打开选项设置时,选项设置窗口会显示在主窗口位置的问题
1 parent d12c2dc commit 641bff4

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

TrafficMonitor/TrafficMonitorDlg.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -710,9 +710,9 @@ void CTrafficMonitorDlg::BackupHistoryTrafficFile()
710710
}
711711
}
712712

713-
void CTrafficMonitorDlg::_OnOptions(int tab)
713+
void CTrafficMonitorDlg::_OnOptions(int tab, CWnd* pParent)
714714
{
715-
COptionsDlg optionsDlg(tab, this);
715+
COptionsDlg optionsDlg(tab, pParent);
716716

717717
//将选项设置数据传递给选项设置对话框
718718
if (COptionsDlg::GetUniqueHandel(OPTION_DLG_NAME) == NULL) //确保此时选项设置对话框已经关闭
@@ -2624,14 +2624,17 @@ void CTrafficMonitorDlg::OnLButtonDblClk(UINT nFlags, CPoint point)
26242624

26252625
void CTrafficMonitorDlg::OnOptions()
26262626
{
2627-
_OnOptions(0);
2627+
_OnOptions(0, this);
26282628
}
26292629

26302630

26312631
//通过任务栏窗口的右键菜单打开“选项”对话框
26322632
void CTrafficMonitorDlg::OnOptions2()
26332633
{
2634-
_OnOptions(1);
2634+
CWnd* pParent = this;
2635+
if (IsTaskbarWndValid())
2636+
pParent = m_tBarDlg;
2637+
_OnOptions(1, pParent);
26352638
}
26362639

26372640

TrafficMonitor/TrafficMonitorDlg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class CTrafficMonitorDlg : public CDialog
163163
void LoadHistoryTraffic();
164164
void BackupHistoryTrafficFile();
165165

166-
void _OnOptions(int tab); //打开“选项”对话框的处理,参数为打开时切换的标签
166+
void _OnOptions(int tab, CWnd* pParent); //打开“选项”对话框的处理,tab:打开时切换的标签
167167

168168
void ApplySettings(COptionsDlg& optionsDlg);
169169

0 commit comments

Comments
 (0)