X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e179bd6537b8e3d7543d23db3b6735ea7effe159..543f08a67631f2849872d5d3ee7cb99047718560:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index bb316835d7..65f6406654 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -192,6 +192,9 @@ wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id, m_res = res; m_accept = accept; m_owner = owner; + (*m_accept) = FALSE; + (*m_res) = ""; + m_startValue = value; } void wxTreeTextCtrl::OnChar( wxKeyEvent &event ) @@ -200,15 +203,14 @@ void wxTreeTextCtrl::OnChar( wxKeyEvent &event ) { (*m_accept) = TRUE; (*m_res) = GetValue(); - m_owner->OnRenameAccept(); - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + m_owner->SetFocus(); return; } if (event.m_keyCode == WXK_ESCAPE) { (*m_accept) = FALSE; (*m_res) = ""; - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + m_owner->SetFocus(); return; } event.Skip(); @@ -216,9 +218,12 @@ void wxTreeTextCtrl::OnChar( wxKeyEvent &event ) void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { - (*m_accept) = FALSE; - (*m_res) = ""; - if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + if (wxPendingDelete.Member(this)) return; + + wxPendingDelete.Append(this); + + if ((*m_accept) && ((*m_res) != m_startValue)) + m_owner->OnRenameAccept(); } #define PIXELS_PER_UNIT 10 @@ -227,7 +232,7 @@ void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) // ----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent) - + wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) : wxNotifyEvent( commandType, id ) { @@ -458,7 +463,7 @@ void wxTreeCtrl::Init() m_imageListState = (wxImageList *) NULL; m_dragCount = 0; - + m_renameTimer = new wxTreeRenameTimer( this ); } @@ -488,7 +493,7 @@ wxTreeCtrl::~wxTreeCtrl() wxDELETE( m_hilightBrush ); DeleteAllItems(); - + delete m_renameTimer; } @@ -1085,18 +1090,25 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE); + wxGenericTreeItem *item = itemId.m_pItem; //wxCHECK_RET( ( (!unselect_others) && is_single), // _T("this is a single selection tree") ); // to keep going anyhow !!! if (is_single) - { + { + if (item->HasHilight()) return; // nothing to do unselect_others=TRUE; extended_select=FALSE; - } - - wxGenericTreeItem *item = itemId.m_pItem; + } + else // check if selection will really change + if (unselect_others && item->HasHilight()) + { + // selection change if there is more than one item currently selected + wxArrayTreeItemIds selected_items; + if (GetSelections(selected_items)==1) return; + } wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() ); event.m_item = item; @@ -1138,16 +1150,18 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, GetEventHandler()->ProcessEvent( event ); } -void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) const +void wxTreeCtrl::FillArray(wxGenericTreeItem *item, + wxArrayTreeItemIds &array) const { - if (item->HasHilight()) array.Add(wxTreeItemId(item)); + if ( item->HasHilight() ) + array.Add(wxTreeItemId(item)); - if (item->HasChildren()) + if ( item->HasChildren() ) { - wxArrayGenericTreeItems& children = item->GetChildren(); - size_t count = children.Count(); - for ( size_t n = 0; n < count; ++n ) - FillArray(children[n],array); + wxArrayGenericTreeItems& children = item->GetChildren(); + size_t count = children.GetCount(); + for ( size_t n = 0; n < count; ++n ) + FillArray(children[n],array); } } @@ -1167,14 +1181,13 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) // first expand all parent branches wxGenericTreeItem *parent = gitem->GetParent(); - while ( parent && !parent->IsExpanded() ) + while ( parent ) { - Expand(parent); - + Expand(parent); parent = parent->GetParent(); } - if (parent) CalculatePositions(); + //if (parent) CalculatePositions(); ScrollTo(item); } @@ -1183,11 +1196,16 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item) { if (!item.IsOk()) return; + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxGenericTreeItem *gitem = item.m_pItem; // now scroll to the item int item_y = gitem->GetY(); - + int start_x = 0; int start_y = 0; ViewStart( &start_x, &start_y ); @@ -1278,7 +1296,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList) // May be toggle off. Then wxTreeCtrl will spread when // necessary (which might look ugly). #if 1 - wxPaintDC dc(this); + wxClientDC dc(this); m_lineHeight = (int)(dc.GetCharHeight() + 4); int width = 0, @@ -1326,10 +1344,10 @@ void wxTreeCtrl::AdjustMyScrollbars() int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const { - if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT) - return item->GetHeight(); - else - return m_lineHeight; + if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT) + return item->GetHeight(); + else + return m_lineHeight; } void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) @@ -1422,9 +1440,9 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & item->SetCross( horizX+m_indent, y ); int exposed_x = dc.LogicalToDeviceX( 0 ); - int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); + int exposed_y = dc.LogicalToDeviceY( item->GetY() ); - if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 )) // 10000 = very much + if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) )) // 10000 = very much { int startX = horizX; int endX = horizX + (m_indent-5); @@ -1440,12 +1458,12 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & dc.SetPen( *wxGREY_PEN ); dc.SetBrush( *wxWHITE_BRUSH ); dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 ); - + dc.SetPen( *wxBLACK_PEN ); dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y ); if (!item->IsExpanded()) dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 ); - + dc.SetPen( m_dottedPen ); } @@ -1509,7 +1527,7 @@ void wxTreeCtrl::DrawBorder(wxTreeItemId &item) wxGenericTreeItem *i=item.m_pItem; - wxPaintDC dc(this); + wxClientDC dc(this); PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); @@ -1528,7 +1546,7 @@ void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below) wxGenericTreeItem *i=item.m_pItem; - wxPaintDC dc(this); + wxClientDC dc(this); PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); @@ -1765,6 +1783,11 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags) { + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxClientDC dc(this); PrepareDC(dc); long x = dc.DeviceToLogicalX( (long)point.x ); @@ -1788,7 +1811,7 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item ) if (!item.IsOk()) return; m_currentEdit = item.m_pItem; - + wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() ); te.m_item = m_currentEdit; te.SetEventObject( this ); @@ -1796,12 +1819,32 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item ) if (!te.IsAllowed()) return; + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxString s = m_currentEdit->GetText(); int x = m_currentEdit->GetX(); int y = m_currentEdit->GetY(); int w = m_currentEdit->GetWidth(); int h = m_currentEdit->GetHeight(); + int image_h = 0; + int image_w = 0; + if ((m_currentEdit->IsExpanded()) && (m_currentEdit->GetSelectedImage() != -1)) + { + m_imageListNormal->GetSize( m_currentEdit->GetSelectedImage(), image_w, image_h ); + image_w += 4; + } + else if (m_currentEdit->GetImage() != -1) + { + m_imageListNormal->GetSize( m_currentEdit->GetImage(), image_w, image_h ); + image_w += 4; + } + x += image_w; + w -= image_w + 4; // I don't know why +4 is needed + wxClientDC dc(this); PrepareDC( dc ); x = dc.LogicalToDeviceX( x ); @@ -1824,16 +1867,14 @@ void wxTreeCtrl::OnRenameAccept() le.SetEventObject( this ); le.m_label = m_renameRes; GetEventHandler()->ProcessEvent( le ); - + if (!le.IsAllowed()) return; - - /* DO CHANGE LABEL */ + + SetItemText( m_currentEdit, m_renameRes ); } - + void wxTreeCtrl::OnMouse( wxMouseEvent &event ) { - if (!event.LeftIsDown()) m_dragCount = 0; - if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return; if ( !m_anchor ) return; @@ -1847,34 +1888,39 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags); bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON; - if (item == NULL) return; /* we hit the blank area */ - if (event.Dragging()) { - if (m_dragCount == 2) /* small drag latency (3?) */ - { - m_dragCount = 0; - - wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId()); - nevent.m_item = m_current; - nevent.SetEventObject(this); - GetEventHandler()->ProcessEvent(nevent); - } - else - { - m_dragCount++; - } - return; + if (m_dragCount == 0) + m_dragStart = wxPoint(x,y); + + m_dragCount++; + + if (m_dragCount != 3) return; + + int command = wxEVT_COMMAND_TREE_BEGIN_DRAG; + if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG; + + wxTreeEvent nevent( command, GetId() ); + nevent.m_item = m_current; + nevent.SetEventObject(this); + GetEventHandler()->ProcessEvent(nevent); + return; + } + else + { + m_dragCount = 0; } - if (event.LeftUp() && (item == m_current) && - (flags & wxTREE_HITTEST_ONITEMLABEL) && - HasFlag(wxTR_EDIT_LABELS) ) + if (item == NULL) return; /* we hit the blank area */ + + if (event.LeftUp() && (item == m_current) && + (flags & wxTREE_HITTEST_ONITEMLABEL) && + HasFlag(wxTR_EDIT_LABELS) ) { m_renameTimer->Start( 100, TRUE ); return; } - + bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE); bool extended_select=(event.ShiftDown() && is_multiple); bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple)); @@ -1917,11 +1963,34 @@ void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc ) { long text_w = 0; long text_h = 0; - // TODO : check for boldness. Here with suppose that font normal and bold - // have the same height ! - // TODO : bug here, text_w is sometime not the correct answer !!! + + wxFont fontOld; + wxFont fontNew; + if (item->IsBold()) + { + fontOld = dc.GetFont(); + if (fontOld.Ok()) + { + // VZ: is there any better way to make a bold variant of old font? + fontNew = wxFont( fontOld.GetPointSize(), + fontOld.GetFamily(), + fontOld.GetStyle(), + wxBOLD, + fontOld.GetUnderlined()); + dc.SetFont(fontNew); + } + else + { + wxFAIL_MSG(_T("wxDC::GetFont() failed!")); + } + } + dc.GetTextExtent( item->GetText(), &text_w, &text_h ); - text_h+=4; + text_h+=2; + + // restore normal font for bold items + if (fontOld.Ok()) + dc.SetFont( fontOld); int image_h = 0; int image_w = 0; @@ -1986,7 +2055,7 @@ void wxTreeCtrl::CalculatePositions() //if(GetImageList() == NULL) // m_lineHeight = (int)(dc.GetCharHeight() + 4); - int y = 2; //GetLineHeight(m_anchor) / 2 + 2; + int y = 2; CalculateLevel( m_anchor, dc, 0, y ); // start recursion } @@ -2015,10 +2084,14 @@ void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item ) wxClientDC dc(this); PrepareDC( dc ); + int cw = 0; + int ch = 0; + GetClientSize( &cw, &ch ); + wxRect rect; - rect.x = dc.LogicalToDeviceX( item->GetX() - 2 ); - rect.y = dc.LogicalToDeviceY( item->GetY()); - rect.width = 1000; + rect.x = dc.LogicalToDeviceX( 0 ); + rect.y = dc.LogicalToDeviceY( item->GetY() ); + rect.width = cw; rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6; Refresh( TRUE, &rect );