squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 08:48:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10094 from Kolcha/pb-fix

Browse Source 
Draw progress bar in Fusion style on macOS systems
This commit is contained in:
sledgehammer999
2019-01-04 00:31:34 +02:00
committed by GitHub
parent 6eaab41820 bd1856594b
commit 88295f8075
3 changed files with 6 additions and 6 deletions
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