Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxGrid cells selecting by mouse more user friendly

Browse Source
This commit is contained in:
Ilya Sinitsyn
2020-03-04 23:32:23 +07:00
committed by Vadim Zeitlin
parent 0920a1646b
commit 8ebdf101b8
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/generic/grid.cpp
View File

@@ -4492,13 +4492,6 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event,
case wxMOD_CONTROL:
if ( isFirstDrag )
SetGridCursor(coords);
if ( m_selection )
{
m_selection->ExtendOrCreateCurrentBlock(m_currentCellCoords,
coords,
event);
MakeCellVisible(coords);
}
break;
case wxMOD_NONE:
@@ -4513,20 +4506,13 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event,
return performDefault;
}
}
if ( m_selection )
{
m_selection->ExtendOrCreateCurrentBlock(m_currentCellCoords,
coords,
event);
MakeCellVisible(coords);
}
break;
default:
// we don't handle the other key modifiers
event.Skip();
}
// Edit the current selection block independently of the modifiers state.
if ( m_selection )
m_selection->ExtendOrCreateCurrentBlock(m_currentCellCoords, coords, event);
return performDefault;
}
@@ -4566,10 +4552,7 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
return;
}
if ( !event.CmdDown() )
ClearSelection();
if ( event.ShiftDown() )
if ( event.ShiftDown() && !event.CmdDown() )
{
if ( m_selection )
{
@@ -4584,7 +4567,7 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
DisableCellEditControl();
MakeCellVisible( coords );
if ( event.CmdDown() )
if ( event.CmdDown() && !event.ShiftDown() )
{
if ( m_selection )
{
@@ -4607,6 +4590,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
}
else
{
ClearSelection();
if ( m_selection )
{
// In row or column selection mode just clicking on the cell
@@ -4632,8 +4617,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
m_waitForSlowClick = m_currentCellCoords == coords &&
coords != wxGridNoCellCoords;
SetCurrentCell( coords );
}
SetCurrentCell(coords);
}
}