Skip to content

Commit 1b1be55

Browse files
DelazJDelazJ
committed
Add scrollbar to only dialog-display mode
and not in widget mode Sur la branche rulebaseDialog modifié : src/app/nodetool/qgsnodetool.h aucune modification n'a été ajoutée à la validation (utilisez "git add" ou
1 parent 171b9ee commit 1b1be55

File tree

2 files changed

+96
-110
lines changed

2 files changed

+96
-110
lines changed

‎src/gui/symbology/qgsrulebasedrendererwidget.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -679,20 +679,25 @@ QgsRendererRulePropsWidget::QgsRendererRulePropsWidget( QgsRuleBasedRenderer::Ru
679679
connect( mScaleRangeWidget, &QgsScaleRangeWidget::rangeChanged, this, &QgsPanelWidget::widgetChanged );
680680
}
681681

682+
#include "qgsvscrollarea.h"
683+
682684
QgsRendererRulePropsDialog::QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule *rule, QgsVectorLayer *layer, QgsStyle *style, QWidget *parent, const QgsSymbolWidgetContext &context )
683685
: QDialog( parent )
684686
{
685687

686688
#ifdef Q_OS_MAC
687689
setWindowModality( Qt::WindowModal );
688690
#endif
689-
this->setLayout( new QVBoxLayout() );
691+
692+
QVBoxLayout *layout = new QVBoxLayout( this );
693+
QgsVScrollArea *scrollArea = new QgsVScrollArea( this );
694+
layout->addWidget( scrollArea );
690695

691696
buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel );
692697
mPropsWidget = new QgsRendererRulePropsWidget( rule, layer, style, this, context );
693698

694-
this->layout()->addWidget( mPropsWidget );
695-
this->layout()->addWidget( buttonBox );
699+
scrollArea->setWidget( mPropsWidget );
700+
layout->addWidget( buttonBox );
696701
this->setWindowTitle( "Edit Rule" );
697702

698703
connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsRendererRulePropsDialog::accept );

‎src/ui/qgsrendererrulepropsdialogbase.ui

+88-107
Original file line numberDiff line numberDiff line change
@@ -6,133 +6,114 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>427</width>
10-
<height>274</height>
9+
<width>376</width>
10+
<height>155</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QVBoxLayout" name="verticalLayout_2">
16+
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>
18-
<widget class="QScrollArea" name="scrollArea">
19-
<property name="widgetResizable">
20-
<bool>true</bool>
18+
<layout class="QFormLayout" name="formLayout">
19+
<property name="fieldGrowthPolicy">
20+
<enum>QFormLayout::ExpandingFieldsGrow</enum>
2121
</property>
22-
<widget class="QWidget" name="scrollAreaWidgetContents">
23-
<property name="geometry">
24-
<rect>
25-
<x>0</x>
26-
<y>0</y>
27-
<width>407</width>
28-
<height>254</height>
29-
</rect>
30-
</property>
31-
<layout class="QVBoxLayout" name="verticalLayout">
32-
<item>
33-
<layout class="QFormLayout" name="formLayout">
34-
<property name="fieldGrowthPolicy">
35-
<enum>QFormLayout::ExpandingFieldsGrow</enum>
36-
</property>
37-
<item row="0" column="0">
38-
<widget class="QLabel" name="label_1">
39-
<property name="text">
40-
<string>Label</string>
41-
</property>
42-
</widget>
43-
</item>
44-
<item row="0" column="1">
45-
<widget class="QLineEdit" name="editLabel"/>
46-
</item>
47-
<item row="1" column="0">
48-
<widget class="QLabel" name="label_5">
49-
<property name="text">
50-
<string>Filter</string>
51-
</property>
52-
</widget>
53-
</item>
54-
<item row="1" column="1">
55-
<layout class="QHBoxLayout" name="horizontalLayout">
56-
<item>
57-
<widget class="QLineEdit" name="editFilter"/>
58-
</item>
59-
<item>
60-
<widget class="QPushButton" name="btnExpressionBuilder">
61-
<property name="sizePolicy">
62-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
63-
<horstretch>0</horstretch>
64-
<verstretch>0</verstretch>
65-
</sizepolicy>
66-
</property>
67-
<property name="text">
68-
<string>…</string>
69-
</property>
70-
</widget>
71-
</item>
72-
<item>
73-
<widget class="QPushButton" name="btnTestFilter">
74-
<property name="text">
75-
<string>Test</string>
76-
</property>
77-
</widget>
78-
</item>
79-
</layout>
80-
</item>
81-
<item row="2" column="0">
82-
<widget class="QLabel" name="label_4">
83-
<property name="text">
84-
<string>Description</string>
85-
</property>
86-
</widget>
87-
</item>
88-
<item row="2" column="1">
89-
<widget class="QLineEdit" name="editDescription"/>
90-
</item>
91-
</layout>
92-
</item>
22+
<item row="0" column="0">
23+
<widget class="QLabel" name="label_1">
24+
<property name="text">
25+
<string>Label</string>
26+
</property>
27+
</widget>
28+
</item>
29+
<item row="0" column="1">
30+
<widget class="QLineEdit" name="editLabel"/>
31+
</item>
32+
<item row="1" column="0">
33+
<widget class="QLabel" name="label_5">
34+
<property name="text">
35+
<string>Filter</string>
36+
</property>
37+
</widget>
38+
</item>
39+
<item row="1" column="1">
40+
<layout class="QHBoxLayout" name="horizontalLayout">
9341
<item>
94-
<widget class="QGroupBox" name="groupScale">
95-
<property name="title">
96-
<string>Scale range</string>
97-
</property>
98-
<property name="checkable">
99-
<bool>true</bool>
100-
</property>
101-
<property name="checked">
102-
<bool>false</bool>
103-
</property>
104-
<layout class="QHBoxLayout" name="horizontalLayout_2">
105-
<item>
106-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
107-
<property name="toolTip">
108-
<string/>
109-
</property>
110-
<property name="whatsThis">
111-
<string/>
112-
</property>
113-
</widget>
114-
</item>
115-
</layout>
116-
</widget>
42+
<widget class="QLineEdit" name="editFilter"/>
11743
</item>
11844
<item>
119-
<widget class="QGroupBox" name="groupSymbol">
45+
<widget class="QPushButton" name="btnExpressionBuilder">
12046
<property name="sizePolicy">
121-
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
47+
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
12248
<horstretch>0</horstretch>
12349
<verstretch>0</verstretch>
12450
</sizepolicy>
12551
</property>
126-
<property name="title">
127-
<string>Symbol</string>
52+
<property name="text">
53+
<string>…</string>
12854
</property>
129-
<property name="checkable">
130-
<bool>true</bool>
55+
</widget>
56+
</item>
57+
<item>
58+
<widget class="QPushButton" name="btnTestFilter">
59+
<property name="text">
60+
<string>Test</string>
13161
</property>
13262
</widget>
13363
</item>
13464
</layout>
135-
</widget>
65+
</item>
66+
<item row="2" column="0">
67+
<widget class="QLabel" name="label_4">
68+
<property name="text">
69+
<string>Description</string>
70+
</property>
71+
</widget>
72+
</item>
73+
<item row="2" column="1">
74+
<widget class="QLineEdit" name="editDescription"/>
75+
</item>
76+
</layout>
77+
</item>
78+
<item>
79+
<widget class="QGroupBox" name="groupScale">
80+
<property name="title">
81+
<string>Scale range</string>
82+
</property>
83+
<property name="checkable">
84+
<bool>true</bool>
85+
</property>
86+
<property name="checked">
87+
<bool>false</bool>
88+
</property>
89+
<layout class="QHBoxLayout" name="horizontalLayout_2">
90+
<item>
91+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
92+
<property name="toolTip">
93+
<string/>
94+
</property>
95+
<property name="whatsThis">
96+
<string/>
97+
</property>
98+
</widget>
99+
</item>
100+
</layout>
101+
</widget>
102+
</item>
103+
<item>
104+
<widget class="QGroupBox" name="groupSymbol">
105+
<property name="sizePolicy">
106+
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
107+
<horstretch>0</horstretch>
108+
<verstretch>0</verstretch>
109+
</sizepolicy>
110+
</property>
111+
<property name="title">
112+
<string>Symbol</string>
113+
</property>
114+
<property name="checkable">
115+
<bool>true</bool>
116+
</property>
136117
</widget>
137118
</item>
138119
</layout>

0 commit comments

Comments
 (0)