d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 21:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Draw progress bar in Fusion style on macOS systems

Browse Source 
Qt has a bug QTBUG-72558, which leads to incorrect progress bar
position, when drawing it in delegate.
Also, since OS X 10.10 Yosemite macOS default style was changed,
and progress bars became very tiny and without text (percentage).
These two cases make qBittorrent look pretty awful, but drawing
progress bar in Fusion style solves both issues.
This commit is contained in:
Nick Korotysh 2019-01-02 10:01:32 +03:00
parent b87987ec89
commit bd1856594b
No known key found for this signature in database
GPG Key ID: 7D0D4117C97CCC46
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/previewlistdelegate.h
View File

@ -36,7 +36,7 @@
#include <QStyleOptionProgressBar> #include <QStyleOptionProgressBar>
#include <QStyleOptionViewItem> #include <QStyleOptionViewItem>
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
#include <QProxyStyle> #include <QProxyStyle>
#endif #endif
@ -76,7 +76,7 @@ public:
newopt.minimum = 0; newopt.minimum = 0;
newopt.state |= QStyle::State_Enabled; newopt.state |= QStyle::State_Enabled;
newopt.textVisible = true; newopt.textVisible = true;
#ifndef Q_OS_WIN #if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
#else #else
// XXX: To avoid having the progress text on the right of the bar // XXX: To avoid having the progress text on the right of the bar

4
src/gui/properties/proplistdelegate.cpp
View File

@ -36,7 +36,7 @@
#include <QProgressBar> #include <QProgressBar>
#include <QStyleOptionProgressBar> #include <QStyleOptionProgressBar>
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
#include <QProxyStyle> #include <QProxyStyle>
#endif #endif
@ -101,7 +101,7 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
newopt.state |= QStyle::State_Enabled; newopt.state |= QStyle::State_Enabled;
} }
#ifndef Q_OS_WIN #if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
#else #else
// XXX: To avoid having the progress text on the right of the bar // XXX: To avoid having the progress text on the right of the bar

4
src/gui/transferlistdelegate.cpp
View File

@ -33,7 +33,7 @@
#include <QPainter> #include <QPainter>
#include <QStyleOptionViewItem> #include <QStyleOptionViewItem>
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
#include <QProxyStyle> #include <QProxyStyle>
#endif #endif
@ -166,7 +166,7 @@ void TransferListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
newopt.minimum = 0; newopt.minimum = 0;
newopt.state |= QStyle::State_Enabled; newopt.state |= QStyle::State_Enabled;
newopt.textVisible = true; newopt.textVisible = true;
#ifndef Q_OS_WIN #if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
#else #else
// XXX: To avoid having the progress text on the right of the bar // XXX: To avoid having the progress text on the right of the bar