From 041254895c4b27b1d6b44ed80f78a8109a03c9c8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 7 Mar 2007 20:58:18 +0000 Subject: [PATCH] use wxRendererNative::DrawItemSelectionRect() to draw wxVListBox items background unless selection background colour is explicitly set (patch 1650804) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/vlbox.h | 5 ++- src/generic/htmllbox.cpp | 11 ------ src/generic/vlbox.cpp | 72 +++++++++++++++++++++++++++++++--------- 3 files changed, 60 insertions(+), 28 deletions(-) diff --git a/include/wx/vlbox.h b/include/wx/vlbox.h index ac1d0286da..b14bfd98f9 100644 --- a/include/wx/vlbox.h +++ b/include/wx/vlbox.h @@ -189,6 +189,9 @@ public: // change the background colour of the selected cells void SetSelectionBackground(const wxColour& col); + // refreshes only the selected items + void RefreshSelected(); + virtual wxVisualAttributes GetDefaultAttributes() const { @@ -235,7 +238,7 @@ protected: void OnKeyDown(wxKeyEvent& event); void OnLeftDown(wxMouseEvent& event); void OnLeftDClick(wxMouseEvent& event); - + void OnSetOrKillFocus(wxFocusEvent& event); // common part of all ctors void Init(); diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp index c7c03d6237..c97e9f347c 100644 --- a/src/generic/htmllbox.cpp +++ b/src/generic/htmllbox.cpp @@ -365,17 +365,6 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const wxHtmlRenderingInfo htmlRendInfo; - // draw the selected cell in selected state - if ( IsSelected(n) ) - { - wxHtmlSelection htmlSel; - htmlSel.Set(wxPoint(0,0), cell, wxPoint(INT_MAX, INT_MAX), cell); - htmlRendInfo.SetSelection(&htmlSel); - if ( m_htmlRendStyle ) - htmlRendInfo.SetStyle(m_htmlRendStyle); - htmlRendInfo.GetState().SetSelectionState(wxHTML_SEL_IN); - } - // note that we can't stop drawing exactly at the window boundary as then // even the visible cells part could be not drawn, so always draw the // entire cell diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp index 2a3ca54d1c..6879d41cbe 100644 --- a/src/generic/vlbox.cpp +++ b/src/generic/vlbox.cpp @@ -36,6 +36,7 @@ #include "wx/dcbuffer.h" #include "wx/selstore.h" +#include "wx/renderer.h" // ---------------------------------------------------------------------------- // event tables @@ -47,6 +48,9 @@ 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) END_EVENT_TABLE() // ============================================================================ @@ -83,7 +87,10 @@ 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); @@ -299,6 +306,16 @@ 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) ) + RefreshLine(n); + } +} + // ---------------------------------------------------------------------------- // wxVListBox appearance parameters // ---------------------------------------------------------------------------- @@ -335,25 +352,39 @@ void wxVListBox::OnDrawSeparator(wxDC& WXUNUSED(dc), void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const { - // we need to render selected and current items differently - const bool isSelected = IsSelected(n), - isCurrent = IsCurrent(n); - if ( isSelected || isCurrent ) + if ( m_colBgSel.IsOk() ) { - if ( isSelected ) - { - dc.SetBrush(wxBrush(m_colBgSel, wxSOLID)); - } - else // !selected + // we need to render selected and current items differently + const bool isSelected = IsSelected(n), + isCurrent = IsCurrent(n); + if ( isSelected || isCurrent ) { - dc.SetBrush(*wxTRANSPARENT_BRUSH); + if ( isSelected ) + { + dc.SetBrush(wxBrush(m_colBgSel, wxSOLID)); + } + else // !selected + { + dc.SetBrush(*wxTRANSPARENT_BRUSH); + } + dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN)); + dc.DrawRectangle(rect); } - - dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN)); - - dc.DrawRectangle(rect); + //else: do nothing for the normal items + } + else // use wxRendererNative for a more native look&feel: + { + int flags = 0; + if ( IsSelected(n) ) + flags |= wxCONTROL_SELECTED; + if ( IsCurrent(n) ) + flags |= wxCONTROL_CURRENT; + if ( wxWindow::FindFocus() == this ) + flags |= wxCONTROL_FOCUSED; + + wxRendererNative::Get().DrawItemSelectionRect( + wx_const_cast(wxVListBox *, this), dc, rect, flags); } - //else: do nothing for the normal items } void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) @@ -410,6 +441,15 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event)) } } +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 // ============================================================================ -- 2.45.2