X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b939bc081a993eda1d0ef56cbabaafee5c69f17..13cfc51d63509eb0da7d1cc1b9b291a4a701119f:/src/generic/vlbox.cpp diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp index 89438eaae9..13ce1b6278 100644 --- a/src/generic/vlbox.cpp +++ b/src/generic/vlbox.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: generic/vlbox.cpp +// Name: src/generic/vlbox.cpp // Purpose: implementation of wxVListBox // Author: Vadim Zeitlin // Modified by: @@ -26,13 +26,17 @@ #if wxUSE_LISTBOX +#include "wx/vlbox.h" + #ifndef WX_PRECOMP #include "wx/settings.h" #include "wx/dcclient.h" + #include "wx/listbox.h" #endif //WX_PRECOMP -#include "wx/vlbox.h" +#include "wx/dcbuffer.h" #include "wx/selstore.h" +#include "wx/renderer.h" // ---------------------------------------------------------------------------- // event tables @@ -44,6 +48,11 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow) EVT_KEY_DOWN(wxVListBox::OnKeyDown) EVT_LEFT_DOWN(wxVListBox::OnLeftDown) EVT_LEFT_DCLICK(wxVListBox::OnLeftDClick) + + EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus) + EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus) + + EVT_SIZE(wxVListBox::OnSize) END_EVENT_TABLE() // ============================================================================ @@ -51,6 +60,7 @@ END_EVENT_TABLE() // ============================================================================ IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow) +const char wxVListBoxNameStr[] = "wxVListBox"; // ---------------------------------------------------------------------------- // wxVListBox creation @@ -70,6 +80,11 @@ bool wxVListBox::Create(wxWindow *parent, long style, const wxString& name) { +#ifdef __WXMSW__ + if ( (style & wxBORDER_MASK) == wxDEFAULT ) + style |= wxBORDER_THEME; +#endif + style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE; if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) ) return false; @@ -80,7 +95,13 @@ bool wxVListBox::Create(wxWindow *parent, // make sure the native widget has the right colour since we do // transparent drawing by default SetBackgroundColour(GetBackgroundColour()); - m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT); + + // leave m_colBgSel in an invalid state: it means for OnDrawBackground() + // to use wxRendererNative instead of painting selection bg ourselves + m_colBgSel = wxNullColour; + + // flicker-free drawing requires this + SetBackgroundStyle(wxBG_STYLE_CUSTOM); return true; } @@ -92,13 +113,17 @@ wxVListBox::~wxVListBox() void wxVListBox::SetItemCount(size_t count) { + // don't leave the current index invalid + if ( m_current != wxNOT_FOUND && (size_t)m_current >= count ) + m_current = count - 1; // also ok when count == 0 as wxNOT_FOUND == -1 + if ( m_selStore ) { // tell the selection store that our number of items has changed m_selStore->SetItemCount(count); } - SetLineCount(count); + SetRowCount(count); } // ---------------------------------------------------------------------------- @@ -122,7 +147,7 @@ bool wxVListBox::Select(size_t item, bool select) if ( changed ) { // selection really changed - RefreshLine(item); + RefreshRow(item); } DoSetCurrent(item); @@ -151,7 +176,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to) { // too many items have changed, we didn't record them in changed array // so we have no choice but to refresh everything between from and to - RefreshLines(from, to); + RefreshRows(from, to); } else // we've got the indices of the changed items { @@ -165,7 +190,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to) // refresh just the lines which have really changed for ( size_t n = 0; n < count; n++ ) { - RefreshLine(changed[n]); + RefreshRow(changed[n]); } } @@ -208,7 +233,7 @@ bool wxVListBox::DoSetCurrent(int current) } if ( m_current != wxNOT_FOUND ) - RefreshLine(m_current); + RefreshRow(m_current); m_current = current; @@ -218,35 +243,37 @@ bool wxVListBox::DoSetCurrent(int current) // don't need to refresh it -- it will be redrawn anyhow if ( !IsVisible(m_current) ) { - ScrollToLine(m_current); + ScrollToRow(m_current); } else // line is at least partly visible { // it is, indeed, only partly visible, so scroll it into view to // make it entirely visible - if ( (size_t)m_current == GetLastVisibleLine() ) - { - ScrollToLine(m_current); - } + while ( (size_t)m_current + 1 == GetVisibleRowsEnd() && + ScrollToRow(GetVisibleBegin() + 1) ) ; // but in any case refresh it as even if it was only partly visible // before we need to redraw it entirely as its background changed - RefreshLine(m_current); + RefreshRow(m_current); } } return true; } +void wxVListBox::InitEvent(wxCommandEvent& event, int n) +{ + event.SetEventObject(this); + event.SetInt(n); +} + void wxVListBox::SendSelectedEvent() { wxASSERT_MSG( m_current != wxNOT_FOUND, _T("SendSelectedEvent() shouldn't be called") ); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId()); - event.SetEventObject(this); - event.SetInt(m_current); - + InitEvent(event, m_current); (void)GetEventHandler()->ProcessEvent(event); } @@ -258,7 +285,10 @@ void wxVListBox::SetSelection(int selection) if ( HasMultipleSelection() ) { - Select(selection); + if (selection != wxNOT_FOUND) + Select(selection); + else + DeselectAll(); m_anchor = selection; } @@ -292,6 +322,41 @@ int wxVListBox::GetNextSelected(unsigned long& cookie) const return wxNOT_FOUND; } +void wxVListBox::RefreshSelected() +{ + // only refresh those items which are currently visible and selected: + for ( size_t n = GetVisibleBegin(), end = GetVisibleEnd(); n < end; n++ ) + { + if ( IsSelected(n) ) + RefreshRow(n); + } +} + +wxRect wxVListBox::GetItemRect(size_t n) const +{ + wxRect itemrect; + + // check that this item is visible + const size_t lineMax = GetVisibleEnd(); + if ( n >= lineMax ) + return itemrect; + size_t line = GetVisibleBegin(); + if ( n < line ) + return itemrect; + + while ( line <= n ) + { + itemrect.y += itemrect.height; + itemrect.height = OnGetRowHeight(line); + + line++; + } + + itemrect.width = GetClientSize().x; + + return itemrect; +} + // ---------------------------------------------------------------------------- // wxVListBox appearance parameters // ---------------------------------------------------------------------------- @@ -315,7 +380,7 @@ void wxVListBox::SetSelectionBackground(const wxColour& col) // wxVListBox painting // ---------------------------------------------------------------------------- -wxCoord wxVListBox::OnGetLineHeight(size_t line) const +wxCoord wxVListBox::OnGetRowHeight(size_t line) const { return OnMeasureItem(line) + 2*m_ptMargins.y; } @@ -326,8 +391,15 @@ void wxVListBox::OnDrawSeparator(wxDC& WXUNUSED(dc), { } -void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const +bool +wxVListBox::DoDrawSolidBackground(const wxColour& col, + wxDC& dc, + const wxRect& rect, + size_t n) const { + if ( !col.IsOk() ) + return false; + // we need to render selected and current items differently const bool isSelected = IsSelected(n), isCurrent = IsCurrent(n); @@ -335,46 +407,70 @@ void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const { if ( isSelected ) { - dc.SetBrush(wxBrush(m_colBgSel, wxSOLID)); + dc.SetBrush(wxBrush(col, wxBRUSHSTYLE_SOLID)); } else // !selected { dc.SetBrush(*wxTRANSPARENT_BRUSH); } - dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN)); - dc.DrawRectangle(rect); } //else: do nothing for the normal items + + return true; +} + +void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const +{ + // use wxRendererNative for more native look unless we use custom bg colour + if ( !DoDrawSolidBackground(m_colBgSel, dc, rect, n) ) + { + int flags = 0; + if ( IsSelected(n) ) + flags |= wxCONTROL_SELECTED; + if ( IsCurrent(n) ) + flags |= wxCONTROL_CURRENT; + if ( wxWindow::FindFocus() == const_cast(this) ) + flags |= wxCONTROL_FOCUSED; + + wxRendererNative::Get().DrawItemSelectionRect( + const_cast(this), dc, rect, flags); + } } void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) { - wxPaintDC dc(this); + wxSize clientSize = GetClientSize(); + + wxAutoBufferedPaintDC dc(this); // the update rectangle wxRect rectUpdate = GetUpdateClientRect(); + // fill it with background colour + dc.SetBackground(GetBackgroundColour()); + dc.Clear(); + // the bounding rectangle of the current line - wxRect rectLine; - rectLine.width = GetClientSize().x; + wxRect rectRow; + rectRow.width = clientSize.x; // iterate over all visible lines - const size_t lineMax = GetLastVisibleLine(); - for ( size_t line = GetFirstVisibleLine(); line <= lineMax; line++ ) + const size_t lineMax = GetVisibleEnd(); + for ( size_t line = GetVisibleBegin(); line < lineMax; line++ ) { - const wxCoord hLine = OnGetLineHeight(line); + const wxCoord hRow = OnGetRowHeight(line); - rectLine.height = hLine; + rectRow.height = hRow; // and draw the ones which intersect the update rect - if ( rectLine.Intersects(rectUpdate) ) + if ( rectRow.Intersects(rectUpdate) ) { // don't allow drawing outside of the lines rectangle - wxDCClipper clip(dc, rectLine); + wxDCClipper clip(dc, rectRow); - wxRect rect = rectLine; + wxRect rect = rectRow; OnDrawBackground(dc, rect, line); OnDrawSeparator(dc, rect, line); @@ -384,7 +480,7 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) } else // no intersection { - if ( rectLine.GetTop() > rectUpdate.GetBottom() ) + if ( rectRow.GetTop() > rectUpdate.GetBottom() ) { // we are already below the update rect, no need to continue // further @@ -393,10 +489,24 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) //else: the next line may intersect the update rect } - rectLine.y += hLine; + rectRow.y += hRow; } } +void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event)) +{ + // we need to repaint the selection when we get the focus since + // wxRendererNative in general draws the focused selection differently + // from the unfocused selection (see OnDrawItem): + RefreshSelected(); +} + +void wxVListBox::OnSize(wxSizeEvent& event) +{ + UpdateScrollbar(); + event.Skip(); +} + // ============================================================================ // wxVListBox keyboard/mouse handling // ============================================================================ @@ -499,11 +609,11 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) break; case WXK_END: - current = GetLineCount() - 1; + current = GetRowCount() - 1; break; case WXK_DOWN: - if ( m_current == (int)GetLineCount() - 1 ) + if ( m_current == (int)GetRowCount() - 1 ) return; current = m_current + 1; @@ -511,7 +621,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) case WXK_UP: if ( m_current == wxNOT_FOUND ) - current = GetLineCount() - 1; + current = GetRowCount() - 1; else if ( m_current != 0 ) current = m_current - 1; else // m_current == 0 @@ -519,19 +629,17 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) break; case WXK_PAGEDOWN: - case WXK_NEXT: PageDown(); - current = GetFirstVisibleLine(); + current = GetVisibleBegin(); break; case WXK_PAGEUP: - case WXK_PRIOR: - if ( m_current == (int)GetFirstVisibleLine() ) + if ( m_current == (int)GetVisibleBegin() ) { PageUp(); } - current = GetFirstVisibleLine(); + current = GetVisibleBegin(); break; case WXK_SPACE: @@ -546,13 +654,7 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) case WXK_TAB: // Since we are using wxWANTS_CHARS we need to send navigation // events for the tabs on MSW - { - wxNavigationKeyEvent ne; - ne.SetDirection(!event.ShiftDown()); - ne.SetCurrentFocus(this); - ne.SetEventObject(this); - GetParent()->GetEventHandler()->ProcessEvent(ne); - } + HandleAsNavigationKey(event); // fall through to default #endif default: @@ -577,8 +679,8 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event) void wxVListBox::OnLeftDown(wxMouseEvent& event) { SetFocus(); - - int item = HitTest(event.GetPosition()); + + int item = VirtualHitTest(event.GetPosition().y); if ( item != wxNOT_FOUND ) { @@ -599,16 +701,25 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event) } } -void wxVListBox::OnLeftDClick(wxMouseEvent& event) +void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse) { - int item = HitTest(event.GetPosition()); + int item = VirtualHitTest(eventMouse.GetPosition().y); if ( item != wxNOT_FOUND ) { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId()); - event.SetEventObject(this); - event.SetInt(item); - (void)GetEventHandler()->ProcessEvent(event); + // if item double-clicked was not yet selected, then treat + // this event as a left-click instead + if ( item == m_current ) + { + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId()); + InitEvent(event, item); + (void)GetEventHandler()->ProcessEvent(event); + } + else + { + OnLeftDown(eventMouse); + } + } } @@ -617,8 +728,6 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& event) // use the same default attributes as wxListBox // ---------------------------------------------------------------------------- -#include "wx/listbox.h" - //static wxVisualAttributes wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)