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

Allow clicking on labels of collapse group boxes to toggle

Browse Source
This commit is contained in:
baldurk
2018-06-13 09:17:03 +01:00
parent 9b33a73631
commit d9bab79dbc
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Styles/RDStyle/RDStyle.cpp
+9 -5
View File
@@ -45,7 +45,8 @@ static const int CheckWidth = 14;
static const int CheckHeight = 14;
static const int CheckMargin = 3;
static const int GroupMargin = 4;
static const int GroupHMargin = 8;
static const int GroupVMargin = 4;
static const int ScrollButtonDim = 12;
static const int ScrollBarMargin = 2;
@@ -357,6 +358,8 @@ QRect RDStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
ret.setHeight(labelHeight);
}
ret.setWidth(group->fontMetrics.width(group->text));
return ret;
}
@@ -378,7 +381,7 @@ QRect RDStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
if(sc == QStyle::SC_GroupBoxContents)
{
ret.setTop(ret.top() + labelHeight + Constants::GroupMargin);
ret.setTop(ret.top() + labelHeight + Constants::GroupHMargin);
return ret;
}
@@ -915,8 +918,8 @@ void RDStyle::drawComplexControl(ComplexControl control, const QStyleOptionCompl
QRect labelRect = subControlRect(CC_GroupBox, opt, QStyle::SC_GroupBoxLabel, widget);
labelRect.adjust(Constants::ButtonMargin + Constants::GroupMargin, Constants::ButtonBorder,
-Constants::ButtonMargin, 0);
labelRect.adjust(Constants::GroupHMargin, Constants::GroupVMargin, Constants::GroupHMargin,
Constants::GroupVMargin);
QColor textColor = group->textColor;
QPalette::ColorRole penRole = QPalette::WindowText;
@@ -930,7 +933,8 @@ void RDStyle::drawComplexControl(ComplexControl control, const QStyleOptionCompl
drawItemText(p, labelRect, Qt::AlignLeft | Qt::AlignTop | Qt::TextHideMnemonic, group->palette,
group->state & State_Enabled, group->text, penRole);
labelRect.adjust(-Constants::GroupMargin, 0, 0, Constants::GroupMargin / 2);
labelRect.setRight(subControlRect(CC_GroupBox, opt, QStyle::SC_GroupBoxFrame, widget).right());
labelRect.adjust(-Constants::GroupHMargin / 2, 0, -Constants::GroupHMargin, 0);
p->setPen(QPen(opt->palette.brush(m_Scheme == Light ? QPalette::Mid : QPalette::Midlight), 1.0));
p->drawLine(labelRect.bottomLeft(), labelRect.bottomRight());
qrenderdoc/Widgets/CollapseGroupBox.cpp
+4 -2
View File
@@ -130,7 +130,9 @@ void CollapseGroupBox::mouseReleaseEvent(QMouseEvent *event)
// pretend we have a groupbox so we can hit-test for it
option.subControls |= QStyle::SC_GroupBoxCheckBox;
if(style()->hitTestComplexControl(QStyle::CC_GroupBox, &option, event->pos(), this) ==
QStyle::SC_GroupBoxCheckBox)
if(style()->hitTestComplexControl(QStyle::CC_GroupBox, &option, event->pos(), this) &
(QStyle::SC_GroupBoxCheckBox | QStyle::SC_GroupBoxLabel))
{
setCollapsed(!m_collapsed);
}
}