#include "wx/dcbuffer.h"
#include "wx/selstore.h"
+#include "wx/renderer.h"
// ----------------------------------------------------------------------------
// event tables
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)
END_EVENT_TABLE()
// ============================================================================
m_current =
m_anchor = wxNOT_FOUND;
m_selStore = NULL;
- m_doubleBuffer = NULL;
}
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;
// 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);
wxVListBox::~wxVListBox()
{
- delete m_doubleBuffer;
delete m_selStore;
}
m_selStore->SetItemCount(count);
}
- SetLineCount(count);
+ SetRowCount(count);
}
// ----------------------------------------------------------------------------
if ( changed )
{
// selection really changed
- RefreshLine(item);
+ RefreshRow(item);
}
DoSetCurrent(item);
{
// 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
{
// refresh just the lines which have really changed
for ( size_t n = 0; n < count; n++ )
{
- RefreshLine(changed[n]);
+ RefreshRow(changed[n]);
}
}
}
if ( m_current != wxNOT_FOUND )
- RefreshLine(m_current);
+ RefreshRow(m_current);
m_current = 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
- while ( (size_t)m_current == GetLastVisibleLine() &&
- ScrollToLine(GetVisibleBegin()+1) ) ;
+ 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 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);
+ }
+}
+
// ----------------------------------------------------------------------------
// wxVListBox appearance parameters
// ----------------------------------------------------------------------------
// wxVListBox painting
// ----------------------------------------------------------------------------
-wxCoord wxVListBox::OnGetLineHeight(size_t line) const
+wxCoord wxVListBox::OnGetRowHeight(size_t line) const
{
return OnMeasureItem(line) + 2*m_ptMargins.y;
}
{
}
-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);
{
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::OnPaint(wxPaintEvent& WXUNUSED(event))
+void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
{
- // If size is larger, recalculate double buffer bitmap
- wxSize clientSize = GetClientSize();
-
- if ( !m_doubleBuffer ||
- clientSize.x > m_doubleBuffer->GetWidth() ||
- clientSize.y > m_doubleBuffer->GetHeight() )
+ // use wxRendererNative for more native look unless we use custom bg colour
+ if ( !DoDrawSolidBackground(m_colBgSel, dc, rect, n) )
{
- delete m_doubleBuffer;
- m_doubleBuffer = new wxBitmap(clientSize.x+25,clientSize.y+25);
+ int flags = 0;
+ if ( IsSelected(n) )
+ flags |= wxCONTROL_SELECTED;
+ if ( IsCurrent(n) )
+ flags |= wxCONTROL_CURRENT;
+ if ( wxWindow::FindFocus() == wx_const_cast(wxVListBox*, this) )
+ flags |= wxCONTROL_FOCUSED;
+
+ wxRendererNative::Get().DrawItemSelectionRect(
+ wx_const_cast(wxVListBox *, this), dc, rect, flags);
}
+}
+
+void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+ wxSize clientSize = GetClientSize();
- wxBufferedPaintDC dc(this,*m_doubleBuffer);
+ wxAutoBufferedPaintDC dc(this);
// the update rectangle
wxRect rectUpdate = GetUpdateClientRect();
dc.Clear();
// the bounding rectangle of the current line
- wxRect rectLine;
- rectLine.width = clientSize.x;
+ wxRect rectRow;
+ rectRow.width = clientSize.x;
// iterate over all visible lines
const size_t lineMax = GetVisibleEnd();
- for ( size_t line = GetFirstVisibleLine(); line < lineMax; line++ )
+ 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);
}
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
//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();
+}
+
+
// ============================================================================
// wxVListBox keyboard/mouse handling
// ============================================================================
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;
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
case WXK_PAGEDOWN:
PageDown();
- current = GetFirstVisibleLine();
+ current = GetVisibleBegin();
break;
case WXK_PAGEUP:
- if ( m_current == (int)GetFirstVisibleLine() )
+ if ( m_current == (int)GetVisibleBegin() )
{
PageUp();
}
- current = GetFirstVisibleLine();
+ current = GetVisibleBegin();
break;
case WXK_SPACE:
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:
{
SetFocus();
- int item = HitTest(event.GetPosition());
+ int item = VirtualHitTest(event.GetPosition().y);
if ( item != wxNOT_FOUND )
{
void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
{
- int item = HitTest(eventMouse.GetPosition());
+ int item = VirtualHitTest(eventMouse.GetPosition().y);
if ( item != wxNOT_FOUND )
{
projects / wxWidgets.git / blobdiff