From ce668a2592718c3d04a1613d62474935b49747bb Mon Sep 17 00:00:00 2001 From: me Date: Tue, 10 Dec 2024 20:37:43 +0100 Subject: [PATCH] Remove Blend() calls that make text illegible --- src/DownloadListCtrl.cpp | 4 ++-- src/GenericClientListCtrl.cpp | 4 ++-- src/SharedFilesCtrl.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DownloadListCtrl.cpp b/src/DownloadListCtrl.cpp index a3bc9ffcb3..9b3bf60bbc 100644 --- a/src/DownloadListCtrl.cpp +++ b/src/DownloadListCtrl.cpp @@ -151,9 +151,9 @@ CMuleListCtrl( parent, winid, pos, size, style | wxLC_OWNERDRAW, validator, name m_menu = NULL; - m_hilightBrush = CMuleColour(wxSYS_COLOUR_HIGHLIGHT).Blend(125).GetBrush(); + m_hilightBrush = CMuleColour(wxSYS_COLOUR_HIGHLIGHT)/*.Blend(125)*/.GetBrush(); - m_hilightUnfocusBrush = CMuleColour(wxSYS_COLOUR_BTNSHADOW).Blend(125).GetBrush(); + m_hilightUnfocusBrush = CMuleColour(wxSYS_COLOUR_BTNSHADOW)/*.Blend(125)*/.GetBrush(); InsertColumn( ColumnPart, _("Part"), wxLIST_FORMAT_LEFT, 30, wxT("a") ); InsertColumn( ColumnFileName, _("File Name"), wxLIST_FORMAT_LEFT, 260, wxT("N") ); diff --git a/src/GenericClientListCtrl.cpp b/src/GenericClientListCtrl.cpp index ec5ab7d802..d38c77cd39 100644 --- a/src/GenericClientListCtrl.cpp +++ b/src/GenericClientListCtrl.cpp @@ -130,9 +130,9 @@ m_columndata(0, NULL) m_menu = NULL; m_showing = false; - m_hilightBrush = CMuleColour(wxSYS_COLOUR_HIGHLIGHT).Blend(125).GetBrush(); + m_hilightBrush = CMuleColour(wxSYS_COLOUR_HIGHLIGHT)/*.Blend(125)*/.GetBrush(); - m_hilightUnfocusBrush = CMuleColour(wxSYS_COLOUR_BTNSHADOW).Blend(125).GetBrush(); + m_hilightUnfocusBrush = CMuleColour(wxSYS_COLOUR_BTNSHADOW)/*.Blend(125)*/.GetBrush(); m_clientcount = 0; } diff --git a/src/SharedFilesCtrl.cpp b/src/SharedFilesCtrl.cpp index bb9ac56481..2d11a85cde 100644 --- a/src/SharedFilesCtrl.cpp +++ b/src/SharedFilesCtrl.cpp @@ -477,7 +477,7 @@ void CSharedFilesCtrl::OnDrawItem( int item, wxDC* dc, const wxRect& rect, const if ( highlighted ) { CMuleColour newcol(GetFocus() ? wxSYS_COLOUR_HIGHLIGHT : wxSYS_COLOUR_BTNSHADOW); - dc->SetBackground(newcol.Blend(125).GetBrush()); + dc->SetBackground(newcol/*.Blend(125)*/.GetBrush()); dc->SetTextForeground( CMuleColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); // The second blending goes over the first one. dc->SetPen(newcol.Blend(65).GetPen());