Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

[Windows] Fixed color of selected text when view loses focus.

Browse Source 
Closes #756
This commit is contained in:
nowrep 2013-02-22 11:59:52 +01:00
parent d01c512520
commit 1cbc8c6d2d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -33,6 +33,8 @@ Version 1.4.0
* fixed possible crash in saving page screen of a really long page * fixed possible crash in saving page screen of a really long page
* fixed showing window in fullscreen with XFCE * fixed showing window in fullscreen with XFCE
* X11: fixed Ctrl+Q shortcut for DEs other than KDE and Gnome * X11: fixed Ctrl+Q shortcut for DEs other than KDE and Gnome
* windows: fixed color of found text when searching on page
* windows: fixed navigating to file links and x: labels in file: scheme handler
* windows: fixed downloading utf-8 encoded adblock subscriptions * windows: fixed downloading utf-8 encoded adblock subscriptions
* windows: improved installer allows registering as default web browser * windows: improved installer allows registering as default web browser
* windows: check and set as default browser from preferences * windows: check and set as default browser from preferences

13
src/lib/app/mainapplication.cpp
View File

@ -977,7 +977,18 @@ RegisterQAppAssociation* MainApplication::associationManager()
QUrl MainApplication::userStyleSheet(const QString &filePath) const QUrl MainApplication::userStyleSheet(const QString &filePath) const
{ {
QString userStyle = AdBlockManager::instance()->elementHidingRules() + "{ display:none !important;}"; QString userStyle;
#ifdef Q_OS_WIN
// Don't grey out selection on losing focus (to prevent graying out found text)
QPalette pal = style()->standardPalette();
QString highlightColor = pal.color(QPalette::Highlight).name();
QString highlightedTextColor = pal.color(QPalette::HighlightedText).name();
userStyle += QString("::selection {background: %1; color: %2;} ").arg(highlightColor, highlightedTextColor);
#endif
userStyle += AdBlockManager::instance()->elementHidingRules() + "{ display:none !important;}";
QFile file(filePath); QFile file(filePath);
if (!filePath.isEmpty() && file.open(QFile::ReadOnly)) { if (!filePath.isEmpty() && file.open(QFile::ReadOnly)) {