lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-13 02:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move subControlRect for CC_ToolButton to RDTweakedNativeStyle

Browse Source 
This means the full rect won't be returned for SC_ToolButtonMenu if it
is used in a context where the default style doesn't expect the menu.

This is a separate commit to isolate future changes to this function.
This commit is contained in:
William Pearson
2023-04-14 19:04:15 +01:00
committed by Baldur Karlsson
parent f82ef87595
commit 4c45c07160
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Styles/RDStyle/RDStyle.cpp
+1 -27
View File
@@ -317,33 +317,7 @@ bool RDStyle::eventFilter(QObject *watched, QEvent *event)
QRect RDStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
const QWidget *widget) const
{
if(cc == QStyle::CC_ToolButton)
{
int indicatorWidth = proxy()->pixelMetric(PM_MenuButtonIndicator, opt, widget);
QRect ret = opt->rect;
const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(opt);
// return the normal rect if there's no menu
if(!(toolbutton->subControls & SC_ToolButtonMenu) &&
!(toolbutton->features & QStyleOptionToolButton::MenuButtonPopup))
{
return ret;
}
if(sc == QStyle::SC_ToolButton)
{
ret.setRight(ret.right() - indicatorWidth);
}
else if(sc == QStyle::SC_ToolButtonMenu)
{
ret.setLeft(ret.right() - indicatorWidth);
}
return ret;
}
else if(cc == QStyle::CC_GroupBox)
if(cc == QStyle::CC_GroupBox)
{
QRect ret = opt->rect;
qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp
+33
View File
@@ -51,6 +51,39 @@ RDTweakedNativeStyle::~RDTweakedNativeStyle()
{
}
QRect RDTweakedNativeStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget) const
{
if(cc == QStyle::CC_ToolButton)
{
int indicatorWidth = proxy()->pixelMetric(PM_MenuButtonIndicator, opt, widget);
QRect ret = opt->rect;
const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(opt);
// return the normal rect if there's no menu
if(!(toolbutton->subControls & SC_ToolButtonMenu) &&
!(toolbutton->features & QStyleOptionToolButton::MenuButtonPopup))
{
return ret;
}
if(sc == QStyle::SC_ToolButton)
{
ret.setRight(ret.right() - indicatorWidth);
}
else if(sc == QStyle::SC_ToolButtonMenu)
{
ret.setLeft(ret.right() - indicatorWidth);
}
return ret;
}
return QProxyStyle::subControlRect(cc, opt, sc, widget);
}
QRect RDTweakedNativeStyle::subElementRect(SubElement element, const QStyleOption *opt,
const QWidget *widget) const
{
qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.h
+2
View File
@@ -35,6 +35,8 @@ public:
RDTweakedNativeStyle(QStyle *parent);
~RDTweakedNativeStyle();
virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
const QWidget *widget = Q_NULLPTR) const override;
virtual QRect subElementRect(SubElement element, const QStyleOption *option,
const QWidget *widget) const override;
virtual QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size,