From: Nate Graham Date: Mon, 27 Jan 2020 16:49:44 +0000 (-0700) Subject: Merge branch 'release/19.12' X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c2fa8ae9ab0df08781b7d032e99d7b8f220c10e0?hp=-c Merge branch 'release/19.12' --- c2fa8ae9ab0df08781b7d032e99d7b8f220c10e0 diff --combined src/kitemviews/kitemlistview.cpp index 5665d9b9c,21cb2ae98..f00805242 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@@ -1,7 -1,8 +1,7 @@@ /*************************************************************************** * Copyright (C) 2011 by Peter Penz * * * - * Based on the Itemviews NG project from Trolltech Labs: * - * http://qt.gitorious.org/qt-labs/itemviews-ng * + * Based on the Itemviews NG project from Trolltech Labs * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@@ -674,7 -675,7 +674,7 @@@ void KItemListView::paint(QPainter* pai if (!m_dropIndicator.isEmpty()) { const QRectF r = m_dropIndicator.toRect(); - QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color(); + QColor color = palette().brush(QPalette::Normal, QPalette::Text).color(); painter->setPen(color); // TODO: The following implementation works only for a vertical scroll-orientation