Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-29 20:34:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update the cursor when the user presses the control key.

Browse source
This commit is contained in:
leo 2012-03-03 01:16:02 +00:00
parent 323b7f4b34
commit 592d3b2c23
2 changed files with 26 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/view.cpp
View file

@ -69,13 +69,15 @@ LC_CURSOR_TYPE View::GetCursor(int Ptx, int Pty) const
case LC_ACTION_ROTATE_VIEW: case LC_ACTION_ROTATE_VIEW:
switch (m_Project->GetOverlayMode()) switch (m_Project->GetOverlayMode())
{ {
case LC_OVERLAY_X: return LC_CURSOR_ROTATEX; case LC_OVERLAY_X:
case LC_OVERLAY_Y: return LC_CURSOR_ROTATEY; return LC_CURSOR_ROTATEX;
case LC_OVERLAY_Z: return LC_CURSOR_ROLL; case LC_OVERLAY_Y:
case LC_OVERLAY_XYZ: return LC_CURSOR_ROTATE_VIEW; return LC_CURSOR_ROTATEY;
case LC_OVERLAY_Z:
return LC_CURSOR_ROLL;
case LC_OVERLAY_XYZ:
default: default:
LC_ASSERT_FALSE("Unknown cursor type."); return LC_CURSOR_ROTATE_VIEW;
return LC_CURSOR_NONE;
} }
case LC_ACTION_ROLL: case LC_ACTION_ROLL:

72
win/Cadview.cpp
View file

@ -661,90 +661,54 @@ void CCADView::OnCaptureChanged(CWnd *pWnd)
CView::OnCaptureChanged(pWnd); CView::OnCaptureChanged(pWnd);
} }
void CCADView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) void CCADView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
{ {
char nKey = nChar; char nKey = nChar;
switch (nChar) if (nChar >= VK_NUMPAD0 && nChar <= VK_NUMPAD9)
{ {
case VK_NUMPAD0 : case VK_NUMPAD1 : case VK_NUMPAD2 : case VK_NUMPAD3 : case VK_NUMPAD4 : nKey = nChar - VK_NUMPAD0 + '0';
case VK_NUMPAD5 : case VK_NUMPAD6 : case VK_NUMPAD7 : case VK_NUMPAD8 : case VK_NUMPAD9 :
{
nKey = nChar - VK_NUMPAD0 + 0x30;
} break;
// select the next/previous piece on the pieces list
case VK_HOME:
case VK_END:
{
/*
CMainFrame* pMain = (CMainFrame*)AfxGetMainWnd ();
CPiecesList& pList = pMain->m_wndPiecesBar.m_wndPiecesList;
LV_FINDINFO lvfi;
int sel;
lvfi.flags = LVFI_PARAM;
lvfi.lParam = (LPARAM)pMain->m_wndPiecesBar.m_wndPiecePreview.GetPieceInfo ();
sel = pList.FindItem (&lvfi);
if (sel != -1)
{
if (nChar == VK_HOME)
sel--;
else
sel++;
pList.SetItemState (sel, LVIS_SELECTED|LVIS_FOCUSED, LVIS_SELECTED|LVIS_FOCUSED);
pList.EnsureVisible (sel, FALSE);
}
*/
} break;
} }
lcGetActiveProject()->OnKeyDown(nKey, GetKeyState (VK_CONTROL) < 0, GetKeyState (VK_SHIFT) < 0); // Update cursor for multiple selection.
/* if (nChar == VK_CONTROL)
switch (nChar)
{ {
// HANDLE CTRL if action == pan/zoom if (lcGetActiveProject()->GetAction() == LC_ACTION_SELECT)
case VK_CONTROL:
if (m_nCurAction == ACTION_SELECT)
{ {
POINT pt; POINT pt;
GetCursorPos(&pt); GetCursorPos(&pt);
CRect rc; CRect rc;
GetWindowRect(rc); GetWindowRect(rc);
if (rc.PtInRect(pt)) if (rc.PtInRect(pt))
OnSetCursor(this, HTCLIENT, 0); OnSetCursor(this, HTCLIENT, 0);
} break; }
*/ }
lcGetActiveProject()->OnKeyDown(nKey, GetKeyState (VK_CONTROL) < 0, GetKeyState (VK_SHIFT) < 0);
CView::OnKeyDown(nChar, nRepCnt, nFlags); CView::OnKeyDown(nChar, nRepCnt, nFlags);
} }
void CCADView::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags) void CCADView::OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags)
{ {
/* if (nChar == VK_CONTROL) // Update cursor for multiple selection.
if (nChar == VK_CONTROL)
{ {
// HANDLE CTRL if action == pan/zoom if (lcGetActiveProject()->GetAction() == LC_ACTION_SELECT)
CCADDoc* pDoc = GetDocument();
if (pDoc->m_nCurAction == ACTION_SELECT)
{ {
POINT pt; POINT pt;
GetCursorPos(&pt); GetCursorPos(&pt);
CRect rc; CRect rc;
GetWindowRect(rc); GetWindowRect(rc);
if (rc.PtInRect(pt)) if (rc.PtInRect(pt))
OnSetCursor(this, HTCLIENT, 0); OnSetCursor(this, HTCLIENT, 0);
} }
} }
*/
CView::OnKeyUp(nChar, nRepCnt, nFlags); CView::OnKeyUp(nChar, nRepCnt, nFlags);
} }