X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f25dbbced23734c716f1c5bda91c30635e894b..0f5378d414cb68caaa535199c1af12dec1720c3d:/src/common/headerctrlcmn.cpp?ds=sidebyside diff --git a/src/common/headerctrlcmn.cpp b/src/common/headerctrlcmn.cpp index 7282425044..25d51cb2f8 100644 --- a/src/common/headerctrlcmn.cpp +++ b/src/common/headerctrlcmn.cpp @@ -23,19 +23,50 @@ #pragma hdrstop #endif +#if wxUSE_HEADERCTRL + #ifndef WX_PRECOMP + #include "wx/menu.h" #endif // WX_PRECOMP #include "wx/headerctrl.h" +#include "wx/rearrangectrl.h" +#include "wx/renderer.h" + +namespace +{ // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -namespace +const unsigned int wxNO_COLUMN = static_cast(-1); + +// ---------------------------------------------------------------------------- +// wxHeaderColumnsRearrangeDialog: dialog for customizing our columns +// ---------------------------------------------------------------------------- + +#if wxUSE_REARRANGECTRL + +class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog { +public: + wxHeaderColumnsRearrangeDialog(wxWindow *parent, + const wxArrayInt& order, + const wxArrayString& items) + : wxRearrangeDialog + ( + parent, + _("Please select the columns to show and define their order:"), + _("Customize Columns"), + order, + items + ) + { + } +}; -const unsigned int wxNO_COLUMN = static_cast(-1); +#endif // wxUSE_REARRANGECTRL } // anonymous namespace @@ -47,6 +78,9 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl"; BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl) EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick) +#if wxUSE_MENUS + EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick) +#endif // wxUSE_MENUS END_EVENT_TABLE() void wxHeaderCtrlBase::ScrollWindow(int dx, @@ -66,14 +100,29 @@ void wxHeaderCtrlBase::ScrollWindow(int dx, void wxHeaderCtrlBase::SetColumnCount(unsigned int count) { - if ( count == GetColumnCount() ) - return; - - OnColumnCountChanging(count); + if ( count != GetColumnCount() ) + OnColumnCountChanging(count); + // still call DoSetCount() even if the count didn't really change in order + // to update all the columns DoSetCount(count); } +int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col) +{ + int w = wxWindowBase::GetTextExtent(col.GetTitle()).x; + + // add some margin: + w += wxRendererNative::Get().GetHeaderButtonMargin(this); + + // if a bitmap is used, add space for it and 2px border: + wxBitmap bmp = col.GetBitmap(); + if ( bmp.IsOk() ) + w += bmp.GetWidth() + 2; + + return w; +} + // ---------------------------------------------------------------------------- // wxHeaderCtrlBase event handling // ---------------------------------------------------------------------------- @@ -81,9 +130,15 @@ void wxHeaderCtrlBase::SetColumnCount(unsigned int count) void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) { const unsigned col = event.GetColumn(); + const wxHeaderColumn& column = GetColumn(col); + + if ( !column.IsResizeable() ) + { + event.Skip(); + return; + } - int w = wxWindowBase::GetTextExtent(GetColumn(col).GetTitle()).x; - w += 4*GetCharWidth(); // add some arbitrary margins around text + int w = GetColumnTitleWidth(column); if ( !UpdateColumnWidthToFit(col, w) ) event.Skip(); @@ -91,6 +146,21 @@ void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event) UpdateColumn(col); } +#if wxUSE_MENUS + +void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event) +{ + if ( !HasFlag(wxHD_ALLOW_HIDE) ) + { + event.Skip(); + return; + } + + ShowColumnsMenu(ScreenToClient(wxGetMousePosition())); +} + +#endif // wxUSE_MENUS + // ---------------------------------------------------------------------------- // wxHeaderCtrlBase column reordering // ---------------------------------------------------------------------------- @@ -218,10 +288,7 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou colIndices.swap(colIndicesNew); } - else // count didn't really change, we shouldn't even be called - { - wxFAIL_MSG( "useless call to DoResizeColumnIndices()" ); - } + //else: count didn't really change, nothing to do wxASSERT_MSG( colIndices.size() == count, "logic error" ); } @@ -230,23 +297,112 @@ wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int cou // wxHeaderCtrl extra UI // ---------------------------------------------------------------------------- -int wxHeaderCtrlBase::ShowColumnsMenu(const wxString& title) +#if wxUSE_MENUS + +void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase) { + const unsigned count = GetColumnCount(); + for ( unsigned n = 0; n < count; n++ ) + { + const wxHeaderColumn& col = GetColumn(n); + menu.AppendCheckItem(idColumnsBase + n, col.GetTitle()); + if ( col.IsShown() ) + menu.Check(n, true); + } +} + +bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title) +{ + // construct the menu with the entries for all columns wxMenu menu; if ( !title.empty() ) menu.SetTitle(title); + AddColumnsItems(menu); + + // ... and an extra one to show the customization dialog if the user is + // allowed to reorder the columns too const unsigned count = GetColumnCount(); + if ( HasFlag(wxHD_ALLOW_REORDER) ) + { + menu.AppendSeparator(); + menu.Append(count, _("&Customize...")); + } + + // do show the menu and get the user selection + const int rc = GetPopupMenuSelectionFromUser(menu, pt); + if ( rc == wxID_NONE ) + return false; + + if ( static_cast(rc) == count ) + { + return ShowCustomizeDialog(); + } + else // a column selected from the menu + { + UpdateColumnVisibility(rc, !GetColumn(rc).IsShown()); + } + + return true; +} + +#endif // wxUSE_MENUS + +bool wxHeaderCtrlBase::ShowCustomizeDialog() +{ +#if wxUSE_REARRANGECTRL + // prepare the data for showing the dialog + wxArrayInt order = GetColumnsOrder(); + + const unsigned count = GetColumnCount(); + + // notice that titles are always in the index order, they will be shown + // rearranged according to the display order in the dialog + wxArrayString titles; + titles.reserve(count); for ( unsigned n = 0; n < count; n++ ) + titles.push_back(GetColumn(n).GetTitle()); + + // this loop is however over positions and not indices + unsigned pos; + for ( pos = 0; pos < count; pos++ ) { - const wxHeaderColumn& col = GetColumn(n); - menu.AppendCheckItem(n, col.GetTitle()); - if ( col.IsShown() ) - menu.Check(n, true); + int& idx = order[pos]; + if ( GetColumn(idx).IsHidden() ) + { + // indicate that this one is hidden + idx = ~idx; + } + } + + // do show it + wxHeaderColumnsRearrangeDialog dlg(this, order, titles); + if ( dlg.ShowModal() == wxID_OK ) + { + // and apply the changes + order = dlg.GetOrder(); + for ( pos = 0; pos < count; pos++ ) + { + int& idx = order[pos]; + const bool show = idx >= 0; + if ( !show ) + { + // make all indices positive for passing them to SetColumnsOrder() + idx = ~idx; + } + + if ( show != GetColumn(idx).IsShown() ) + UpdateColumnVisibility(idx, show); + } + + UpdateColumnsOrder(order); + SetColumnsOrder(order); + + return true; } +#endif // wxUSE_REARRANGECTRL - return GetPopupMenuSelectionFromUser(menu, - ScreenToClient(wxGetMousePosition())); + return false; } // ============================================================================ @@ -258,7 +414,7 @@ void wxHeaderCtrlSimple::Init() m_sortKey = wxNO_COLUMN; } -wxHeaderColumn& wxHeaderCtrlSimple::GetColumn(unsigned int idx) +const wxHeaderColumn& wxHeaderCtrlSimple::GetColumn(unsigned int idx) const { return m_cols[idx]; } @@ -302,7 +458,7 @@ void wxHeaderCtrlSimple::DoShowSortIndicator(unsigned int idx, bool ascending) { RemoveSortIndicator(); - m_cols[idx].SetAsSortKey(ascending); + m_cols[idx].SetSortOrder(ascending); m_sortKey = idx; UpdateColumn(idx); @@ -339,21 +495,23 @@ wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle) IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent) -const wxEventType wxEVT_COMMAND_HEADER_CLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RIGHT_CLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_CLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_CLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent); + +wxDEFINE_EVENT( wxEVT_HEADER_DCLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_DCLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RIGHT_DCLICK = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_MIDDLE_DCLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_RESIZING, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_END_RESIZE, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_BEGIN_RESIZE = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_RESIZING = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_RESIZE = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent); +wxDEFINE_EVENT( wxEVT_HEADER_END_REORDER, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxNewEventType(); -const wxEventType wxEVT_COMMAND_HEADER_END_REORDER = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent); -const wxEventType wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxNewEventType(); +#endif // wxUSE_HEADERCTRL