razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

restore addSpecifiedSizedImageToIcon function

Browse source
This commit is contained in:
konero 2023-09-03 13:35:54 +01:00 committed by manongjohn
parent cce15602e7
commit 26e6db165c
3 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
toonz/sources/include/toonzqt/gutil.h
View file

@ -162,6 +162,11 @@ void DVAPI addImagesToIcon(QIcon &icon, const QImage &baseImg,
//-----------------------------------------------------------------------------
void DVAPI addSpecifiedSizedImageToIcon(QIcon &icon, const char *iconSVGName,
QSize newSize = QSize());
//-----------------------------------------------------------------------------
void DVAPI addPixmapToAllModesAndStates(QIcon &icon, const QPixmap &pixmap);
//-----------------------------------------------------------------------------

21
toonz/sources/toonzqt/gutil.cpp
View file

@ -508,6 +508,27 @@ void addImagesToIcon(QIcon &icon, const QImage &baseImg, const QImage &overImg,
//-----------------------------------------------------------------------------
void addSpecifiedSizedImageToIcon(QIcon &icon, const char *iconSVGName,
QSize newSize) {
static int devPixRatio = getHighestDevicePixelRatio();
newSize *= devPixRatio;
// Construct icon filenames
QString iconName = QString::fromUtf8(iconSVGName);
QString overIconName = iconName + "_over";
QString onIconName = iconName + "_on";
// Generate icon images
QImage baseImg = generateIconImage(iconName, 1.0, newSize);
QImage overImg = generateIconImage(overIconName, 1.0, newSize);
QImage onImg = generateIconImage(onIconName, 1.0, newSize);
// Add newly sized images to the icon
addImagesToIcon(icon, baseImg, overImg, onImg);
}
//-----------------------------------------------------------------------------
// Add the same pixmap to all modes and states of a QIcon
void addPixmapToAllModesAndStates(QIcon &icon, const QPixmap &pixmap) {
QIcon::Mode modes[] = {QIcon::Normal, QIcon::Disabled, QIcon::Selected};

2
toonz/sources/toonzqt/menubarcommand.cpp
View file

@ -424,7 +424,7 @@ void CommandManager::enlargeIcon(CommandId id, const QSize dstSize) {
return;
}
icon = createQIcon(iconSVGName, false, false, dstSize);
addSpecifiedSizedImageToIcon(icon, iconSVGName, dstSize);
action->setIcon(icon);
}