Remove remaining bits of marker drawing during resizing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -137,9 +137,6 @@ private:
|
|||||||
// given column plus its minimal width and return the effective width
|
// given column plus its minimal width and return the effective width
|
||||||
int ConstrainByMinWidth(unsigned int col, int& xPhysical);
|
int ConstrainByMinWidth(unsigned int col, int& xPhysical);
|
||||||
|
|
||||||
// update the current position of the resizing marker
|
|
||||||
void UpdateResizingMarker(int xPhysical);
|
|
||||||
|
|
||||||
// update the information displayed while a column is being moved around
|
// update the information displayed while a column is being moved around
|
||||||
void UpdateReorderingMarker(int xPhysical);
|
void UpdateReorderingMarker(int xPhysical);
|
||||||
|
|
||||||
|
@@ -258,26 +258,14 @@ void wxHeaderCtrl::ClearMarkers()
|
|||||||
dcover.Clear();
|
dcover.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxHeaderCtrl::UpdateResizingMarker(int xPhysical)
|
|
||||||
{
|
|
||||||
wxClientDC dc(this);
|
|
||||||
|
|
||||||
wxDCOverlay dcover(m_overlay, &dc);
|
|
||||||
dcover.Clear();
|
|
||||||
|
|
||||||
// unfortunately drawing the marker over the parent window doesn't work as
|
|
||||||
// it's usually covered by another window (the main control view) so just
|
|
||||||
// draw the marker over the header itself, even if it makes it not very
|
|
||||||
// useful
|
|
||||||
dc.SetPen(*wxLIGHT_GREY_PEN);
|
|
||||||
dc.DrawLine(xPhysical, 0, xPhysical, GetClientSize().y);
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxHeaderCtrl::EndDragging()
|
void wxHeaderCtrl::EndDragging()
|
||||||
{
|
{
|
||||||
ClearMarkers();
|
// We currently only use markers for reordering, not for resizing
|
||||||
|
if (IsReordering())
|
||||||
m_overlay.Reset();
|
{
|
||||||
|
ClearMarkers();
|
||||||
|
m_overlay.Reset();
|
||||||
|
}
|
||||||
|
|
||||||
// don't use the special dragging cursor any more
|
// don't use the special dragging cursor any more
|
||||||
SetCursor(wxNullCursor);
|
SetCursor(wxNullCursor);
|
||||||
@@ -344,8 +332,6 @@ void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical)
|
|||||||
}
|
}
|
||||||
//else: we had already done the above when we started
|
//else: we had already done the above when we started
|
||||||
|
|
||||||
// This results in ugly flicker
|
|
||||||
// UpdateResizingMarker(xPhysical);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user