[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1126,8 +1126,14 @@ void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int fla
|
|||||||
wxRect selRect(rect);
|
wxRect selRect(rect);
|
||||||
selRect.y += focusSpacingY;
|
selRect.y += focusSpacingY;
|
||||||
selRect.height -= (focusSpacingY*2);
|
selRect.height -= (focusSpacingY*2);
|
||||||
selRect.x += m_widthCustomPaint + focusSpacingX;
|
|
||||||
selRect.width -= m_widthCustomPaint + (focusSpacingX*2);
|
int wcp = 0;
|
||||||
|
|
||||||
|
if ( !(flags & wxCONTROL_ISSUBMENU) )
|
||||||
|
wcp += m_widthCustomPaint;
|
||||||
|
|
||||||
|
selRect.x += wcp + focusSpacingX;
|
||||||
|
selRect.width -= wcp + (focusSpacingX*2);
|
||||||
|
|
||||||
wxColour bgCol;
|
wxColour bgCol;
|
||||||
|
|
||||||
|
@@ -298,8 +298,14 @@ void wxComboCtrl::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
|
|||||||
wxRect selRect(rect);
|
wxRect selRect(rect);
|
||||||
selRect.y += focusSpacingY;
|
selRect.y += focusSpacingY;
|
||||||
selRect.height -= (focusSpacingY*2);
|
selRect.height -= (focusSpacingY*2);
|
||||||
selRect.x += m_widthCustomPaint + focusSpacingX;
|
|
||||||
selRect.width -= m_widthCustomPaint + (focusSpacingX*2);
|
int wcp = 0;
|
||||||
|
|
||||||
|
if ( !(flags & wxCONTROL_ISSUBMENU) )
|
||||||
|
wcp += m_widthCustomPaint;
|
||||||
|
|
||||||
|
selRect.x += wcp + focusSpacingX;
|
||||||
|
selRect.width -= wcp + (focusSpacingX*2);
|
||||||
|
|
||||||
if ( hTheme )
|
if ( hTheme )
|
||||||
theme = wxUxThemeEngine::GetIfActive();
|
theme = wxUxThemeEngine::GetIfActive();
|
||||||
|
Reference in New Issue
Block a user