Skip to content

Commit 7b1ee07

Browse files
nirvnm-kuhn
authored andcommitted
[gui] improve scale widget layout to save space (#3243)
1 parent 4080aad commit 7b1ee07

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/gui/qgsscalerangewidget.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
2525
mLayout = new QGridLayout( this );
2626
mLayout->setContentsMargins( 0, 0, 0, 0 );
2727

28-
QLabel* minLbl = new QLabel( tr( "Minimum\n(exclusive)" ), this );
28+
QLabel* minLbl = new QLabel( tr( "Minimum (exclusive)" ), this );
2929
minLbl->setWordWrap( true );
3030
minLbl->setAlignment( Qt::AlignTop );
3131
minLbl->setToolTip( tr( "Minimum scale, i.e. maximum scale denominator. "
3232
"This limit is exclusive, that means the layer will not be displayed on this scale." ) );
33-
QLabel* maxLbl = new QLabel( tr( "Maximum\n(inclusive)" ), this );
33+
QLabel* maxLbl = new QLabel( tr( "Maximum (inclusive)" ), this );
3434
maxLbl->setWordWrap( true );
3535
maxLbl->setAlignment( Qt::AlignTop );
3636
maxLbl->setToolTip( tr( "Maximum scale, i.e. minimum scale denominator. "
@@ -51,19 +51,17 @@ QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
5151
mMinimumScaleWidget->setScale( 1.0 / 100000 );
5252
mMaximumScaleWidget->setScale( 1.0 / 1000 );
5353

54-
mLayout->addWidget( minLbl, 0, 0, 2, 1 );
55-
mLayout->addWidget( mMinimumScaleIconLabel, 0, 1 );
56-
mLayout->addWidget( mMinimumScaleWidget, 0, 2 );
57-
mLayout->addWidget( maxLbl, 0, 3, 2, 1 );
58-
mLayout->addWidget( mMaximumScaleIconLabel, 0, 4 );
59-
mLayout->addWidget( mMaximumScaleWidget, 0, 5 );
54+
mLayout->addWidget( minLbl, 0, 0, 1, 2 );
55+
mLayout->addWidget( mMinimumScaleIconLabel, 1, 0 );
56+
mLayout->addWidget( mMinimumScaleWidget, 1, 1 );
57+
mLayout->addWidget( maxLbl, 0, 2, 1, 2 );
58+
mLayout->addWidget( mMaximumScaleIconLabel, 1, 2 );
59+
mLayout->addWidget( mMaximumScaleWidget, 1, 3 );
6060

6161
mLayout->setColumnStretch( 0, 0 );
62-
mLayout->setColumnStretch( 1, 0 );
63-
mLayout->setColumnStretch( 2, 3 );
64-
mLayout->setColumnStretch( 3, 0 );
65-
mLayout->setColumnStretch( 4, 0 );
66-
mLayout->setColumnStretch( 5, 3 );
62+
mLayout->setColumnStretch( 1, 3 );
63+
mLayout->setColumnStretch( 2, 0 );
64+
mLayout->setColumnStretch( 3, 3 );
6765

6866
connect( mMinimumScaleWidget, SIGNAL( scaleChanged( double ) ), this, SLOT( emitRangeChanged() ) );
6967
connect( mMaximumScaleWidget, SIGNAL( scaleChanged( double ) ), this, SLOT( emitRangeChanged() ) );

0 commit comments

Comments
 (0)