sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-05-01 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove margin fix and tighten up spacing

Browse Source
This commit is contained in:
Larry Shaffer 2012-09-10 00:18:39 -06:00
parent 3caf80a811
commit b54a3eb6a9
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/qgscollapsiblegroupbox.cpp
View File

@ -27,25 +27,20 @@ QIcon QgsCollapsibleGroupBox::mCollapseIcon;
QIcon QgsCollapsibleGroupBox::mExpandIcon; QIcon QgsCollapsibleGroupBox::mExpandIcon;
QgsCollapsibleGroupBox::QgsCollapsibleGroupBox( QWidget *parent ) QgsCollapsibleGroupBox::QgsCollapsibleGroupBox( QWidget *parent )
: QGroupBox( parent ), mCollapsed( true ), mMarginOffset( 0 ) : QGroupBox( parent ), mCollapsed( true )
{ {
init(); init();
} }
QgsCollapsibleGroupBox::QgsCollapsibleGroupBox( const QString &title, QgsCollapsibleGroupBox::QgsCollapsibleGroupBox( const QString &title,
QWidget *parent ) QWidget *parent )
: QGroupBox( title, parent ), mCollapsed( true ), mMarginOffset( 0 ) : QGroupBox( title, parent ), mCollapsed( true )
{ {
init(); init();
} }
void QgsCollapsibleGroupBox::init() void QgsCollapsibleGroupBox::init()
{ {
/* Top margin fix is to increase the vertical default spacing
between multiple groupboxes, especially ones without title checkboxes
may not be necessary on certain platforms */
mMarginOffset = 0; // in pixels; for temporary testing across platforms
// init icons // init icons
if ( mCollapseIcon.isNull() ) if ( mCollapseIcon.isNull() )
{ {
@ -56,19 +51,10 @@ void QgsCollapsibleGroupBox::init()
// customize style sheet // customize style sheet
// TODO: move to app stylesheet system, when appropriate // TODO: move to app stylesheet system, when appropriate
QString ss; QString ss;
if ( mMarginOffset > 0 )
{
ss += "QgsCollapsibleGroupBox {";
ss += QString( " margin-top: %1px;" ).arg( mMarginOffset + 8 );
ss += "}";
}
ss += "QgsCollapsibleGroupBox::title {"; ss += "QgsCollapsibleGroupBox::title {";
ss += " subcontrol-origin: margin;"; ss += " subcontrol-origin: margin;";
ss += " subcontrol-position: top left;"; ss += " subcontrol-position: top left;";
// ss += QString( " font-size: %1";).arg( appFontSize ); ss += " margin-left: 20px;"; // offset for disclosure triangle
ss += " margin-left: 24px;"; // offset for disclosure triangle
if ( mMarginOffset > 0 )
ss += QString( " margin-top: %1px;" ).arg( mMarginOffset );
ss += "}"; ss += "}";
setStyleSheet( ss ); setStyleSheet( ss );
@ -80,8 +66,6 @@ void QgsCollapsibleGroupBox::init()
// TODO set size (as well as margins) depending on theme // TODO set size (as well as margins) depending on theme
mCollapseButton->setIconSize( QSize( 12, 12 ) ); mCollapseButton->setIconSize( QSize( 12, 12 ) );
mCollapseButton->setIcon( mExpandIcon ); mCollapseButton->setIcon( mExpandIcon );
if ( mMarginOffset > 0 )
mCollapseButton->move( 0, mMarginOffset ); // match title offset
// clear toolbutton default background and border // clear toolbutton default background and border
// TODO: move to app stylesheet system, when appropriate // TODO: move to app stylesheet system, when appropriate
@ -141,7 +125,7 @@ void QgsCollapsibleGroupBox::setCollapsed( bool collapse )
// for consistent look/spacing across platforms when collapsed // for consistent look/spacing across platforms when collapsed
setFlat( collapse ); setFlat( collapse );
setMaximumHeight( collapse ? 36 : 16777215 ); setMaximumHeight( collapse ? 28 : 16777215 );
// if we are collapsing, save hidden widgets in a list // if we are collapsing, save hidden widgets in a list
if ( collapse ) if ( collapse )

1
src/gui/qgscollapsiblegroupbox.h
View File

@ -56,7 +56,6 @@ class GUI_EXPORT QgsCollapsibleGroupBox : public QGroupBox
bool mCollapsed; bool mCollapsed;
QList< QWidget* > mHiddenWidgets; QList< QWidget* > mHiddenWidgets;
QToolButton* mCollapseButton; QToolButton* mCollapseButton;
int mMarginOffset;
static QIcon mCollapseIcon; static QIcon mCollapseIcon;
static QIcon mExpandIcon; static QIcon mExpandIcon;