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

Only support detection of "near the edge" coordinates, if dragging grid lines

Browse Source 
is actually enabled (Fixes #548106 - Border of grid lines of wx.grid).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-08-30 22:38:14 +00:00
parent 195a89b47c
commit be2e4015f5
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/grid.cpp
View File

@@ -8532,15 +8532,23 @@ int wxGrid::XToCol( int x, bool clipToMinMax )
return GetColAt( maxPos ); return GetColAt( maxPos );
} }
// return the row number that that the y coord is near the edge of, or // return the row number that that the y coord is near
// -1 if not near an edge // the edge of, or -1 if not near an edge.
// coords can only possibly be near an edge if
// (a) the row/column is large enough to still allow for an "inner" area
// that is _not_ nead the edge (i.e., if the height/width is smaller
// than WXGRID_LABEL_EDGE_ZONE, coords are _never_ considered to be
// near the edge).
// and
// (b) resizing rows/columns (the thing for which edge detection is
// relevant at all) is enabled.
// //
int wxGrid::YToEdgeOfRow( int y ) int wxGrid::YToEdgeOfRow( int y )
{ {
int i; int i;
i = internalYToRow(y); i = internalYToRow(y);
if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE ) if ( GetRowHeight(i) > WXGRID_LABEL_EDGE_ZONE && CanDragRowSize() )
{ {
// We know that we are in row i, test whether we are // We know that we are in row i, test whether we are
// close enough to lower or upper border, respectively. // close enough to lower or upper border, respectively.
@@ -8555,13 +8563,14 @@ int wxGrid::YToEdgeOfRow( int y )
// return the col number that that the x coord is near the edge of, or // return the col number that that the x coord is near the edge of, or
// -1 if not near an edge // -1 if not near an edge
// See comment at YToEdgeOfRow for conditions on edge detection.
// //
int wxGrid::XToEdgeOfCol( int x ) int wxGrid::XToEdgeOfCol( int x )
{ {
int i; int i;
i = internalXToCol(x); i = internalXToCol(x);
if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE ) if ( GetColWidth(i) > WXGRID_LABEL_EDGE_ZONE && CanDragColSize() )
{ {
// We know that we are in column i; test whether we are // We know that we are in column i; test whether we are
// close enough to right or left border, respectively. // close enough to right or left border, respectively.