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

9
src/ads_globals.cpp
View File

@ -415,6 +415,8 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
Button->setIcon(getStandardPixmapIcon(Button, StandarPixmap)); Button->setIcon(getStandardPixmapIcon(Button, StandarPixmap));
} }
//============================================================================
void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixmap, QIcon Icon) void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixmap, QIcon Icon)
{ {
// First we try to use custom icons if available // First we try to use custom icons if available
@ -426,15 +428,16 @@ void setButtonIcon(QAbstractButton *Button, QStyle::StandardPixmap StandardPixma
Button->setIcon(getStandardPixmapIcon(Button, StandardPixmap)); 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) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
return Button->style()->standardIcon(Pixmap); return Button->style()->standardIcon(StandardPixmap);
#else #else
// The standard icons does not look good on high DPI screens so we create // The standard icons does not look good on high DPI screens so we create
// our own "standard" icon here. // 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; QIcon icon;
icon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled); icon.addPixmap(internal::createTransparentPixmap(normalPixmap, 0.25), QIcon::Disabled);
icon.addPixmap(normalPixmap, QIcon::Normal); icon.addPixmap(normalPixmap, QIcon::Normal);

20
src/ads_globals.h
View File

@ -140,10 +140,10 @@ enum eIcon
*/ */
enum eAutoHideIcon enum eAutoHideIcon
{ {
AutoHideAutoHideIcon, //!< AutoHideIcon AutoHideAutoHideIcon, //!< AutoHideAutoHideIcon
AutoHideDockAreaMenuIcon, //!< DockAreaMenuIcon AutoHideDockAreaMenuIcon, //!< AutoHideDockAreaMenuIcon
AutoHideDockAreaUndockIcon,//!< DockAreaUndockIcon AutoHideDockAreaUndockIcon,//!< AutoHideDockAreaUndockIcon
AutoHideDockAreaCloseIcon, //!< DockAreaCloseIcon AutoHideDockAreaCloseIcon, //!< AutoHideDockAreaCloseIcon
AutoHideIconCount, //!< just a delimiter for range checks AutoHideIconCount, //!< just a delimiter for range checks
}; };
@ -357,14 +357,24 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
ads::eIcon CustomIconId); 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); 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); QIcon getStandardPixmapIcon(QAbstractButton* Button, QStyle::StandardPixmap Pixmap);
enum eRepolishChildOptions enum eRepolishChildOptions
{ {
RepolishIgnoreChildren, RepolishIgnoreChildren,