Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better handling of customized mouse shortcuts.

Browse source
This commit is contained in:
leo 2016-05-09 01:59:10 +00:00
parent f24b0923bb
commit 2e276f26df
2 changed files with 36 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
common/view.cpp
View file

@ -2373,28 +2373,8 @@ void View::CancelTrackingOrClearSelection()
mModel->ClearSelection(true);
}
void View::OnLeftButtonDown()
void View::OnButtonDown(lcTrackButton TrackButton)
{
if (mTrackButton != LC_TRACKBUTTON_NONE)
{
StopTracking(false);
return;
}
gMainWindow->SetActiveView(this);
lcTrackTool OverrideTool = GetOverrideTrackTool(Qt::LeftButton);
if (OverrideTool != LC_TRACKTOOL_NONE)
{
mTrackTool = OverrideTool;
OnUpdateCursor();
}
else if (mTrackTool == LC_TRACKTOOL_MOVE_XYZ)
mTrackTool = LC_TRACKTOOL_MOVE_XY;
else if (mTrackTool == LC_TRACKTOOL_ROTATE_XYZ)
mTrackTool = LC_TRACKTOOL_ROTATE_XY;
switch (mTrackTool)
{
case LC_TRACKTOOL_NONE:
@ -2429,7 +2409,7 @@ void View::OnLeftButtonDown()
case LC_TRACKTOOL_SPOTLIGHT:
case LC_TRACKTOOL_CAMERA:
StartTracking(LC_TRACKBUTTON_LEFT);
StartTracking(TrackButton);
break;
case LC_TRACKTOOL_SELECT:
@ -2441,7 +2421,7 @@ void View::OnLeftButtonDown()
else
mModel->ClearSelectionAndSetFocus(ObjectSection);
StartTracking(LC_TRACKBUTTON_LEFT);
StartTracking(TrackButton);
}
break;
@ -2453,7 +2433,7 @@ void View::OnLeftButtonDown()
case LC_TRACKTOOL_MOVE_YZ:
case LC_TRACKTOOL_MOVE_XYZ:
if (mModel->AnyObjectsSelected())
StartTracking(LC_TRACKBUTTON_LEFT);
StartTracking(TrackButton);
break;
case LC_TRACKTOOL_ROTATE_X:
@ -2462,13 +2442,13 @@ void View::OnLeftButtonDown()
case LC_TRACKTOOL_ROTATE_XY:
case LC_TRACKTOOL_ROTATE_XYZ:
if (mModel->AnyPiecesSelected())
StartTracking(LC_TRACKBUTTON_LEFT);
StartTracking(TrackButton);
break;
case LC_TRACKTOOL_SCALE_PLUS:
case LC_TRACKTOOL_SCALE_MINUS:
if (mModel->AnyPiecesSelected())
StartTracking(LC_TRACKBUTTON_LEFT);
StartTracking(TrackButton);
break;
case LC_TRACKTOOL_ERASER:
@ -2486,11 +2466,36 @@ void View::OnLeftButtonDown()
case LC_TRACKTOOL_ORBIT_XY:
case LC_TRACKTOOL_ROLL:
case LC_TRACKTOOL_ZOOM_REGION:
StartTracking(LC_TRACKBUTTON_LEFT);
StartTracking(TrackButton);
break;
}
}
void View::OnLeftButtonDown()
{
if (mTrackButton != LC_TRACKBUTTON_NONE)
{
StopTracking(false);
return;
}
gMainWindow->SetActiveView(this);
lcTrackTool OverrideTool = GetOverrideTrackTool(Qt::LeftButton);
if (OverrideTool != LC_TRACKTOOL_NONE)
{
mTrackTool = OverrideTool;
OnUpdateCursor();
}
else if (mTrackTool == LC_TRACKTOOL_MOVE_XYZ)
mTrackTool = LC_TRACKTOOL_MOVE_XY;
else if (mTrackTool == LC_TRACKTOOL_ROTATE_XYZ)
mTrackTool = LC_TRACKTOOL_ROTATE_XY;
OnButtonDown(LC_TRACKBUTTON_LEFT);
}
void View::OnLeftButtonUp()
{
StopTracking(mTrackButton == LC_TRACKBUTTON_LEFT);
@ -2524,8 +2529,9 @@ void View::OnMiddleButtonDown()
{
mTrackTool = OverrideTool;
OnUpdateCursor();
StartTracking(LC_TRACKBUTTON_MIDDLE);
}
OnButtonDown(LC_TRACKBUTTON_MIDDLE);
}
void View::OnMiddleButtonUp()
@ -2555,54 +2561,7 @@ void View::OnRightButtonDown()
else if (mTrackTool == LC_TRACKTOOL_ROTATE_XYZ)
mTrackTool = LC_TRACKTOOL_ROTATE_Z;
switch (mTrackTool)
{
case LC_TRACKTOOL_NONE:
case LC_TRACKTOOL_INSERT:
case LC_TRACKTOOL_POINTLIGHT:
case LC_TRACKTOOL_SPOTLIGHT:
case LC_TRACKTOOL_CAMERA:
case LC_TRACKTOOL_SELECT:
break;
case LC_TRACKTOOL_MOVE_X:
case LC_TRACKTOOL_MOVE_Y:
case LC_TRACKTOOL_MOVE_Z:
case LC_TRACKTOOL_MOVE_XY:
case LC_TRACKTOOL_MOVE_XZ:
case LC_TRACKTOOL_MOVE_YZ:
case LC_TRACKTOOL_MOVE_XYZ:
if (mModel->AnyObjectsSelected())
StartTracking(LC_TRACKBUTTON_RIGHT);
break;
case LC_TRACKTOOL_ROTATE_X:
case LC_TRACKTOOL_ROTATE_Y:
case LC_TRACKTOOL_ROTATE_Z:
case LC_TRACKTOOL_ROTATE_XY:
case LC_TRACKTOOL_ROTATE_XYZ:
if (mModel->AnyPiecesSelected())
StartTracking(LC_TRACKBUTTON_RIGHT);
break;
case LC_TRACKTOOL_SCALE_PLUS:
case LC_TRACKTOOL_SCALE_MINUS:
case LC_TRACKTOOL_ERASER:
case LC_TRACKTOOL_PAINT:
break;
case LC_TRACKTOOL_ZOOM:
StartTracking(LC_TRACKBUTTON_RIGHT);
break;
case LC_TRACKTOOL_PAN:
case LC_TRACKTOOL_ORBIT_X:
case LC_TRACKTOOL_ORBIT_Y:
case LC_TRACKTOOL_ORBIT_XY:
case LC_TRACKTOOL_ROLL:
case LC_TRACKTOOL_ZOOM_REGION:
break;
}
OnButtonDown(LC_TRACKBUTTON_RIGHT);
}
void View::OnRightButtonUp()

1
common/view.h
View file

@ -138,6 +138,7 @@ protected:
float GetOverlayScale() const;
void StartTracking(lcTrackButton TrackButton);
void StopTracking(bool Accept);
void OnButtonDown(lcTrackButton TrackButton);
lcScene mScene;
lcDragState mDragState;