Skip to content

Commit ad05389

Browse files
committed
Restored parent-child relationship for widgets in constructor
1 parent ba79d1f commit ad05389

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

plugins/gui/src/gatelibrary_management/gatelibrary_tab_widgets/gatelibrary_tab_general.cpp

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,58 +99,51 @@ namespace hal
9999
GateLibraryTabGeneral::GateLibraryTabGeneral(QWidget* parent) : GateLibraryTabInterface(parent)
100100
{
101101
QVBoxLayout* topLayout = new QVBoxLayout(this);
102+
QScrollArea* scroll = new QScrollArea(this); // add scrollbar if needed
102103

103-
//QScrollArea* scroll = new QScrollArea(this); // add scrollbar if needed
104-
//QVBoxLayout* layout = new QVBoxLayout(scroll);
104+
QFrame* content = new QFrame(scroll);
105+
QVBoxLayout* layout = new QVBoxLayout(content);
105106

106-
QScrollArea* scroll = new QScrollArea();
107-
QVBoxLayout* layout = new QVBoxLayout();
108-
QFrame* content = new QFrame();
109-
110-
111-
mGeneralFrame = new GatelibraryFrameGeneral(this);
107+
mGeneralFrame = new GatelibraryFrameGeneral(content);
112108
layout->addWidget(mGeneralFrame);
113109

114-
mFlipflopFrame = new GatelibraryFrameFF(this);
110+
mFlipflopFrame = new GatelibraryFrameFF(content);
115111
layout->addWidget(mFlipflopFrame);
116112
mFlipflopFrame->hide();
117113

118-
mStateFrame = new GatelibraryFrameState(this);
114+
mStateFrame = new GatelibraryFrameState(content);
119115
layout->addWidget(mStateFrame);
120116
mStateFrame->hide();
121117

122-
mLutFrame = new GatelibraryFrameLut(this);
118+
mLutFrame = new GatelibraryFrameLut(content);
123119
layout->addWidget(mLutFrame);
124120
mLutFrame->hide();
125121

126-
mInitFrame = new GatelibraryFrameInit(this);
122+
mInitFrame = new GatelibraryFrameInit(content);
127123
layout->addWidget(mInitFrame);
128124
mInitFrame->hide();
129125

130-
mBooleanFrame = new GatelibraryFrameBoolean(this);
126+
mBooleanFrame = new GatelibraryFrameBoolean(content);
131127
layout->addWidget(mBooleanFrame);
132128
mBooleanFrame->hide();
133129

134-
mLatchFrame = new GateLibraryFrameLatch(this);
130+
mLatchFrame = new GateLibraryFrameLatch(content);
135131
layout->addWidget(mLatchFrame);
136132
mLatchFrame->hide();
137133

138-
mRAMFrame = new GateLibraryFrameRAM(this);
134+
mRAMFrame = new GateLibraryFrameRAM(content);
139135
layout->addWidget(mRAMFrame);
140136
mRAMFrame->hide();
141137

142-
mRAMPortFrame = new GateLibraryFrameRAMPort(this);
138+
mRAMPortFrame = new GateLibraryFrameRAMPort(content);
143139
layout->addWidget(mRAMPortFrame);
144140
mRAMPortFrame->hide();
145141

142+
scroll->setWidget(content);
146143
scroll->setWidgetResizable(true);
147144

148145
content->setLayout(layout);
149146
topLayout->addWidget(scroll);
150-
scroll->setWidget(content);
151-
152-
153-
//topLayout->addWidget(scroll);
154147
}
155148

156149
void GateLibraryTabGeneral::update(GateType* gt)

0 commit comments

Comments
 (0)