Browse Source
Fix LineEdit widget size issues Up-scale the icons on statusbar Up-scale the icons in options dialog. Closes #7729. Fix small icons in cookie manager Fix progress bar height Fix small icons in confirm delete dialog Fix small icons in options dialog Fix small images in about dialogadaptive-webui-19844
Chocobo1
7 years ago
25 changed files with 211 additions and 133 deletions
@ -1,5 +0,0 @@ |
|||||||
<!DOCTYPE RCC><RCC version="1.0"> |
|
||||||
<qresource> |
|
||||||
<file>lineeditimages/search.png</file> |
|
||||||
</qresource> |
|
||||||
</RCC> |
|
||||||
|
Before Width: | Height: | Size: 292 B |
@ -0,0 +1,79 @@ |
|||||||
|
/*
|
||||||
|
* Bittorrent Client using Qt and libtorrent. |
||||||
|
* Copyright (C) 2017 Mike Tzou |
||||||
|
* |
||||||
|
* 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 the Free Software Foundation; either version 2 |
||||||
|
* of the License, or (at your option) any later version. |
||||||
|
* |
||||||
|
* This program is distributed in the hope that it will be useful, |
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
* GNU General Public License for more details. |
||||||
|
* |
||||||
|
* You should have received a copy of the GNU General Public License |
||||||
|
* along with this program; if not, write to the Free Software |
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||||
|
* |
||||||
|
* In addition, as a special exception, the copyright holders give permission to |
||||||
|
* link this program with the OpenSSL project's "OpenSSL" library (or with |
||||||
|
* modified versions of it that use the same license as the "OpenSSL" library), |
||||||
|
* and distribute the linked executables. You must obey the GNU General Public |
||||||
|
* License in all respects for all of the code used other than "OpenSSL". If you |
||||||
|
* modify file(s), you may extend this exception to your version of the file(s), |
||||||
|
* but you are not obligated to do so. If you do not wish to do so, delete this |
||||||
|
* exception statement from your version. |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "utils.h" |
||||||
|
|
||||||
|
#include <QApplication> |
||||||
|
#include <QDesktopWidget> |
||||||
|
#include <QScreen> |
||||||
|
#include <QStyle> |
||||||
|
#include <QWidget> |
||||||
|
#include <QWindow> |
||||||
|
|
||||||
|
qreal Utils::Gui::screenScalingFactor(const QWidget *widget) |
||||||
|
{ |
||||||
|
#ifdef Q_OS_WIN |
||||||
|
const int screen = qApp->desktop()->screenNumber(widget); |
||||||
|
return (QApplication::screens()[screen]->logicalDotsPerInch() / 96); |
||||||
|
#else |
||||||
|
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) |
||||||
|
return widget->devicePixelRatioF(); |
||||||
|
#else |
||||||
|
return widget->devicePixelRatio(); |
||||||
|
#endif |
||||||
|
#endif // Q_OS_WIN
|
||||||
|
} |
||||||
|
|
||||||
|
QPixmap Utils::Gui::scaledPixmap(const QString &path, const QWidget *widget, const int height) |
||||||
|
{ |
||||||
|
const QPixmap pixmap(path); |
||||||
|
const int scaledHeight = ((height > 0) ? height : pixmap.height()) * Utils::Gui::screenScalingFactor(widget); |
||||||
|
return pixmap.scaledToHeight(scaledHeight, Qt::SmoothTransformation); |
||||||
|
} |
||||||
|
|
||||||
|
QSize Utils::Gui::smallIconSize(const QWidget *widget) |
||||||
|
{ |
||||||
|
// Get DPI scaled icon size (device-dependent), see QT source
|
||||||
|
// under a 1080p screen is usually 16x16
|
||||||
|
const int s = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, widget); |
||||||
|
return QSize(s, s); |
||||||
|
} |
||||||
|
|
||||||
|
QSize Utils::Gui::mediumIconSize(const QWidget *widget) |
||||||
|
{ |
||||||
|
// under a 1080p screen is usually 24x24
|
||||||
|
return ((smallIconSize(widget) + largeIconSize(widget)) / 2); |
||||||
|
} |
||||||
|
|
||||||
|
QSize Utils::Gui::largeIconSize(const QWidget *widget) |
||||||
|
{ |
||||||
|
// Get DPI scaled icon size (device-dependent), see QT source
|
||||||
|
// under a 1080p screen is usually 32x32
|
||||||
|
const int s = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize, nullptr, widget); |
||||||
|
return QSize(s, s); |
||||||
|
} |
||||||
@ -0,0 +1,50 @@ |
|||||||
|
/*
|
||||||
|
* Bittorrent Client using Qt and libtorrent. |
||||||
|
* Copyright (C) 2017 Mike Tzou |
||||||
|
* |
||||||
|
* 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 the Free Software Foundation; either version 2 |
||||||
|
* of the License, or (at your option) any later version. |
||||||
|
* |
||||||
|
* This program is distributed in the hope that it will be useful, |
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
* GNU General Public License for more details. |
||||||
|
* |
||||||
|
* You should have received a copy of the GNU General Public License |
||||||
|
* along with this program; if not, write to the Free Software |
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||||
|
* |
||||||
|
* In addition, as a special exception, the copyright holders give permission to |
||||||
|
* link this program with the OpenSSL project's "OpenSSL" library (or with |
||||||
|
* modified versions of it that use the same license as the "OpenSSL" library), |
||||||
|
* and distribute the linked executables. You must obey the GNU General Public |
||||||
|
* License in all respects for all of the code used other than "OpenSSL". If you |
||||||
|
* modify file(s), you may extend this exception to your version of the file(s), |
||||||
|
* but you are not obligated to do so. If you do not wish to do so, delete this |
||||||
|
* exception statement from your version. |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef UTILS_GUI_H |
||||||
|
#define UTILS_GUI_H |
||||||
|
|
||||||
|
#include <QtGlobal> |
||||||
|
#include <QPixmap> |
||||||
|
#include <QSize> |
||||||
|
|
||||||
|
class QWidget; |
||||||
|
|
||||||
|
namespace Utils |
||||||
|
{ |
||||||
|
namespace Gui |
||||||
|
{ |
||||||
|
qreal screenScalingFactor(const QWidget *widget); |
||||||
|
QPixmap scaledPixmap(const QString &path, const QWidget *widget, const int height = 0); |
||||||
|
QSize smallIconSize(const QWidget *widget = nullptr); |
||||||
|
QSize mediumIconSize(const QWidget *widget = nullptr); |
||||||
|
QSize largeIconSize(const QWidget *widget = nullptr); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
#endif // UTILS_GUI_H
|
||||||
Loading…
Reference in new issue