X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74d283aac44903607326730427b4bbf66dc83a06..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/generic/headerctrlg.h?ds=inline diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h index 489dad5acc..8c9a842d3c 100644 --- a/include/wx/generic/headerctrlg.h +++ b/include/wx/generic/headerctrlg.h @@ -71,10 +71,17 @@ private: void OnKeyDown(wxKeyEvent& event); void OnCaptureLost(wxMouseCaptureLostEvent& event); + // move the column with given idx at given position (this doesn't generate + // any events but does refresh the display) + void DoMoveCol(unsigned int idx, unsigned int pos); + // return the horizontal start position of the given column in physical // coordinates int GetColStart(unsigned int idx) const; + // and the end position + int GetColEnd(unsigned int idx) const; + // refresh the given column [only]; idx must be valid void RefreshCol(unsigned int idx); @@ -89,14 +96,24 @@ private: // position is near the divider at the right end of this column (notice // that this means that we return column 0 even if the position is over // column 1 but close enough to the divider separating it from column 0) - int FindColumnAtPoint(int x, bool& onSeparator) const; + unsigned int FindColumnAtPoint(int x, bool *onSeparator = NULL) const; // return true if a drag resizing operation is currently in progress bool IsResizing() const; + // return true if a drag reordering operation is currently in progress + bool IsReordering() const; + + // return true if any drag operation is currently in progress + bool IsDragging() const { return IsResizing() || IsReordering(); } + // end any drag operation currently in progress (resizing or reordering) void EndDragging(); + // cancel the drag operation currently in progress and generate an event + // about it + void CancelDragging(); + // start (if m_colBeingResized is -1) or continue resizing the column // // this generates wxEVT_COMMAND_HEADER_BEGIN_RESIZE/RESIZING events and can @@ -107,13 +124,24 @@ private: // about it with its cancelled flag set if xPhysical is -1 void EndResizing(int xPhysical); + // same functions as above but for column moving/reordering instead of + // resizing + void StartReordering(unsigned int col, int xPhysical); + + // returns true if we did drag the column somewhere else or false if we + // didn't really move it -- in this case we consider that no reordering + // took place and that a normal column click event should be generated + bool EndReordering(int xPhysical); + // constrain the given position to be larger than the start position of the // given column plus its minimal width and return the effective width int ConstrainByMinWidth(unsigned int col, int& xPhysical); - // update the current position of the resizing marker if xPhysical is a - // valid physical coordinate value or remove it entirely if it is -1 - void UpdateResizingMarker(int xPhysical); + // update the information displayed while a column is being moved around + void UpdateReorderingMarker(int xPhysical); + + // clear any overlaid markers + void ClearMarkers(); // number of columns in the control currently @@ -126,6 +154,14 @@ private: // progress unsigned int m_colBeingResized; + // the column being moved or -1 if there is no reordering operation in + // progress + unsigned int m_colBeingReordered; + + // the distance from the start of m_colBeingReordered and the mouse + // position when the user started to drag it + int m_dragOffset; + // the horizontal scroll offset int m_scrollOffset; @@ -138,7 +174,7 @@ private: DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHeaderCtrl) + wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl); }; #endif // _WX_GENERIC_HEADERCTRLG_H_