Software/iDescriptor
1
0
Fork 0
mirror of https://github.com/iDescriptor/iDescriptor.git synced 2026-06-22 03:45:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

v0.1.2

Browse Source 
-Properly scale icons
-Show changelog
-Add iconSizeBaseMultiplier
This commit is contained in:
uncor3
2025-12-08 20:02:38 +00:00
parent f0d049a2da
commit c1f38dbd18
17 changed files with 327 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/iDescriptor-ui.h
+65 -14
View File
@@ -18,6 +18,7 @@
*/
#pragma once
#include "settingsmanager.h"
#include <QAbstractButton>
#include <QApplication>
#include <QGraphicsView>
@@ -141,18 +142,35 @@ class ZIconWidget : public QAbstractButton
{
Q_OBJECT
public:
ZIconWidget(const QIcon &icon, const QString &tooltip,
QWidget *parent = nullptr)
: QAbstractButton(parent), m_icon(icon)
ZIconWidget(const QIcon &icon, const QString &tooltip = "",
qreal iconSizeMultiplier = 1.0, QWidget *parent = nullptr)
: QAbstractButton(parent), m_icon(icon),
m_iconSizeMultiplier(iconSizeMultiplier)
{
setToolTip(tooltip);
setFixedSize(32, 32);
setIconSize(QSize(24, 24));
if (tooltip != "") {
setToolTip(tooltip);
}
QFontMetrics fm(font());
double baseSize =
fm.height() * m_iconSizeMultiplier *
SettingsManager::sharedInstance()->iconSizeBaseMultiplier();
int intBaseSize = qRound(baseSize);
m_iconSize = QSize(intBaseSize, intBaseSize);
setFixedSize(intBaseSize + 10, intBaseSize + 10);
update();
setCursor(Qt::PointingHandCursor);
connect(qApp, &QApplication::paletteChanged, this,
[this]() { update(); });
}
void setIconSizeMultiplier(qreal multiplier)
{
m_iconSizeMultiplier = multiplier;
updateIconSize();
}
void setIcon(const QIcon &icon)
{
m_icon = ZIcon(icon);
@@ -176,14 +194,31 @@ protected:
}
QRect iconRect = rect();
iconRect.setSize(iconSize()); // Use iconSize() from QAbstractButton
iconRect.setSize(m_iconSize);
iconRect.moveCenter(rect().center());
m_icon.paint(&painter, iconRect, palette());
}
private:
void updateIconSize()
{
QFontMetrics fm(font());
double baseSize =
fm.height() * m_iconSizeMultiplier *
SettingsManager::sharedInstance()->iconSizeBaseMultiplier();
int intBaseSize = qRound(baseSize);
setFixedSize(intBaseSize + 10, intBaseSize + 10);
m_iconSize = QSize(intBaseSize, intBaseSize);
update();
}
private:
ZIcon m_icon;
QSize m_iconSize;
qreal m_iconSizeMultiplier;
};
// Add this new class for display-only icons
@@ -192,15 +227,16 @@ class ZIconLabel : public QLabel
Q_OBJECT
public:
ZIconLabel(const QIcon &icon, const QString &tooltip,
QWidget *parent = nullptr)
: QLabel(parent), m_icon(icon), m_iconSize(24, 24)
qreal iconSizeMultiplier = 1.0, QWidget *parent = nullptr)
: QLabel(parent), m_icon(icon), m_iconSizeMultiplier(iconSizeMultiplier)
{
setToolTip(tooltip);
// setFixedSize(32, 32);
updateIconSize();
connect(qApp, &QApplication::paletteChanged, this,
[this]() { update(); });
connect(qApp, &QApplication::fontChanged, this,
[this]() { updateIconSize(); });
}
void setIcon(const QIcon &icon)
{
m_icon = ZIcon(icon);
@@ -213,10 +249,10 @@ public:
update();
}
void setIconSize(const QSize &size)
void setIconSizeMultiplier(qreal multiplier)
{
m_iconSize = size;
update();
m_iconSizeMultiplier = multiplier;
updateIconSize();
}
protected:
@@ -234,8 +270,23 @@ protected:
}
private:
void updateIconSize()
{
QFontMetrics fm(font());
double baseSize =
fm.height() * m_iconSizeMultiplier *
SettingsManager::sharedInstance()->iconSizeBaseMultiplier();
int intBaseSize = qRound(baseSize);
setFixedSize(intBaseSize + 10, intBaseSize + 10);
m_iconSize = QSize(intBaseSize, intBaseSize);
update();
}
ZIcon m_icon;
QSize m_iconSize;
qreal m_iconSizeMultiplier;
};
enum class iDescriptorTool {