mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Cleanup.

Browse Source
This commit is contained in:
Cynthia Pang 2023-10-20 15:18:40 +08:00
parent 9d081593d0
commit 9312f2cf58
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/IconProvider.h
View File

@ -47,9 +47,9 @@ public:
* if no custom icon is registered
*/
QIcon customIcon(eIcon IconId) const;
QIcon customIcon(eAutoHideIcon IconId) const;
QIcon customIcon(eAutoHideIcon IconId) const;
/**
/**
* Registers a custom icon for the given IconId
*/
void registerCustomIcon(eIcon IconId, const QIcon &icon);

17
src/ads_globals.cpp
View File

@ -415,8 +415,10 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
Button->setIcon(getStandardPixmapIcon(Button, StandarPixmap));
}
//============================================================================
void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixmap, QIcon Icon)
{
{
// First we try to use custom icons if available
if (!Icon.isNull())
{
@ -424,23 +426,24 @@ void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixma
return;
}
Button->setIcon(getStandardPixmapIcon(Button, StandardPixmap));
}
}
//============================================================================
QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap Pixmap)
{
QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap StandardPixmap)
{
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
return Button->style()->standardIcon(Pixmap);
return Button->style()->standardIcon(StandardPixmap);
#else
// The standard icons does not look good on high DPI screens so we create
// our own "standard" icon here.
const QPixmap normalPixmap = Button->style()->standardPixmap(Pixmap, 0, Button);
const QPixmap normalPixmap = Button->style()->standardPixmap(StandardPixmap, 0, Button);
QIcon icon;
icon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled);
icon.addPixmap(normalPixmap, QIcon::Normal);
return icon;
#endif
}
}
//============================================================================

20
src/ads_globals.h
View File

@ -140,10 +140,10 @@ enum eIcon
*/
enum eAutoHideIcon
{
AutoHideAutoHideIcon, //!< AutoHideIcon
AutoHideDockAreaMenuIcon, //!< DockAreaMenuIcon
AutoHideDockAreaUndockIcon,//!< DockAreaUndockIcon
AutoHideDockAreaCloseIcon, //!< DockAreaCloseIcon
AutoHideAutoHideIcon, //!< AutoHideAutoHideIcon
AutoHideDockAreaMenuIcon, //!< AutoHideDockAreaMenuIcon
AutoHideDockAreaUndockIcon,//!< AutoHideDockAreaUndockIcon
AutoHideDockAreaCloseIcon, //!< AutoHideDockAreaCloseIcon
AutoHideIconCount, //!< just a delimiter for range checks
};
@ -357,14 +357,24 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
ads::eIcon CustomIconId);
/**
* Helper function to set the icon of a certain button.
* Use this function to set the icons for the dock area and dock widget buttons.
* If icon given is not a valid icon (icon is null), the function fetches the
* given standard pixmap from the QStyle.
* param[in] Button The button whose icons are to be set
* param[in] StandardPixmap The standard pixmap to be used for the button
* param[in] Icon The custom icon
*/
void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandardPixmap, QIcon Icon);
/**
* Return the icon of standard pixmap for button.
* Returns the standard pixmap icon for button from QStyle.
*/
QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap Pixmap);
enum eRepolishChildOptions
{
RepolishIgnoreChildren,