Skip to content

Commit 834d83c

Browse files
committed
Fix child window'w clipping bug
1 parent a4532ed commit 834d83c

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

sources/TablDesk/ButtonsPanel.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,7 @@ void CButtonsPanel::OnViewCrnkMap()
11171117
MLL::GetString(IDS_MAPS_TEMPERATURE_UNIT).c_str(),
11181118
MLL::GetString(IDS_MAPS_INJPW_UNIT).c_str(),
11191119
MLL::GetString(IDS_CRNK_MAP).c_str(), false);
1120+
DLL::Chart2DSetOnWndActivation(m_crnk_map_wnd_handle,OnWndActivationCrnkMap,this);
11201121
DLL::Chart2DSetAxisValuesFormat(m_crnk_map_wnd_handle, 1, _T("%.01f"));
11211122
DLL::Chart2DSetOnChange(m_crnk_map_wnd_handle, OnChangeCrnkMap, this);
11221123
DLL::Chart2DSetOnClose(m_crnk_map_wnd_handle, OnCloseCrnkMap, this);
@@ -1186,6 +1187,7 @@ void CButtonsPanel::OnViewDeadMap()
11861187
MLL::GetString(IDS_DEAD_MAP).c_str(), false);
11871188
DLL::Chart2DSetPtValuesFormat(m_dead_map_wnd_handle, _T("#0.00"));
11881189
DLL::Chart2DSetPtMovingStep(m_dead_map_wnd_handle, 0.1f);
1190+
DLL::Chart2DSetOnWndActivation(m_dead_map_wnd_handle,OnWndActivationDeadMap,this);
11891191
DLL::Chart2DSetAxisValuesFormat(m_dead_map_wnd_handle, 1, _T("%.01f"));
11901192
DLL::Chart2DSetOnChange(m_dead_map_wnd_handle, OnChangeDeadMap, this);
11911193
DLL::Chart2DSetOnClose(m_dead_map_wnd_handle, OnCloseDeadMap, this);
@@ -1454,7 +1456,6 @@ void CButtonsPanel::OnUpdateViewAFRMap(CCmdUI* pCmdUI)
14541456
pCmdUI->SetCheck( (m_afr_map_chart_state) ? TRUE : FALSE );
14551457
}
14561458

1457-
14581459
void CButtonsPanel::OnUpdateViewCrnkMap(CCmdUI* pCmdUI)
14591460
{
14601461
bool allowed = IsAllowed();
@@ -1770,7 +1771,7 @@ HWND CButtonsPanel::GetMapWindow(int wndType)
17701771
void CButtonsPanel::_EnableCharts(bool enable)
17711772
{
17721773
if (m_charts_enabled != (int)enable)
1773-
{
1774+
{//ignition
17741775
if (m_start_map_chart_state && ::IsWindow(m_start_map_wnd_handle))
17751776
DLL::Chart2DEnable(m_start_map_wnd_handle, enable && IsAllowed());
17761777
if (m_idle_map_chart_state && ::IsWindow(m_idle_map_wnd_handle))
@@ -1779,27 +1780,27 @@ void CButtonsPanel::_EnableCharts(bool enable)
17791780
DLL::Chart3DEnable(m_work_map_wnd_handle, enable && IsAllowed());
17801781
if (m_temp_map_chart_state && ::IsWindow(m_temp_map_wnd_handle))
17811782
DLL::Chart2DEnable(m_temp_map_wnd_handle, enable && IsAllowed());
1782-
1783+
//fuel injection
17831784
if (m_ve_map_chart_state && ::IsWindow(m_ve_map_wnd_handle))
17841785
DLL::Chart3DEnable(m_ve_map_wnd_handle, enable && IsAllowed());
17851786
if (m_afr_map_chart_state && ::IsWindow(m_afr_map_wnd_handle))
17861787
DLL::Chart3DEnable(m_afr_map_wnd_handle, enable && IsAllowed());
17871788
if (m_crnk_map_chart_state && ::IsWindow(m_crnk_map_wnd_handle))
1788-
DLL::Chart3DEnable(m_crnk_map_wnd_handle, enable && IsAllowed());
1789+
DLL::Chart2DEnable(m_crnk_map_wnd_handle, enable && IsAllowed());
17891790
if (m_wrmp_map_chart_state && ::IsWindow(m_wrmp_map_wnd_handle))
1790-
DLL::Chart3DEnable(m_wrmp_map_wnd_handle, enable && IsAllowed());
1791+
DLL::Chart2DEnable(m_wrmp_map_wnd_handle, enable && IsAllowed());
17911792
if (m_dead_map_chart_state && ::IsWindow(m_dead_map_wnd_handle))
1792-
DLL::Chart3DEnable(m_dead_map_wnd_handle, enable && IsAllowed());
1793+
DLL::Chart2DEnable(m_dead_map_wnd_handle, enable && IsAllowed());
17931794
if (m_idlr_map_chart_state && ::IsWindow(m_idlr_map_wnd_handle))
1794-
DLL::Chart3DEnable(m_idlr_map_wnd_handle, enable && IsAllowed());
1795+
DLL::Chart2DEnable(m_idlr_map_wnd_handle, enable && IsAllowed());
17951796
if (m_idlc_map_chart_state && ::IsWindow(m_idlc_map_wnd_handle))
1796-
DLL::Chart3DEnable(m_idlc_map_wnd_handle, enable && IsAllowed());
1797+
DLL::Chart2DEnable(m_idlc_map_wnd_handle, enable && IsAllowed());
17971798
if (m_aetps_map_chart_state && ::IsWindow(m_aetps_map_wnd_handle))
1798-
DLL::Chart3DEnable(m_aetps_map_wnd_handle, enable && IsAllowed());
1799+
DLL::Chart2DEnable(m_aetps_map_wnd_handle, enable && IsAllowed());
17991800
if (m_aerpm_map_chart_state && ::IsWindow(m_aerpm_map_wnd_handle))
1800-
DLL::Chart3DEnable(m_aerpm_map_wnd_handle, enable && IsAllowed());
1801+
DLL::Chart2DEnable(m_aerpm_map_wnd_handle, enable && IsAllowed());
18011802
if (m_aftstr_map_chart_state && ::IsWindow(m_aftstr_map_wnd_handle))
1802-
DLL::Chart3DEnable(m_aftstr_map_wnd_handle, enable && IsAllowed());
1803+
DLL::Chart2DEnable(m_aftstr_map_wnd_handle, enable && IsAllowed());
18031804

18041805
if (mp_gridModeEditorDlg.get() && m_grid_map_state && ::IsWindow(mp_gridModeEditorDlg->m_hWnd))
18051806
mp_gridModeEditorDlg->UpdateDialogControls(mp_gridModeEditorDlg.get(), TRUE);

0 commit comments

Comments
 (0)