feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectMode: Fix double scrollbar

Browse Source 
The Build and Run pages already have a scrollbar, so remove the
outer scrollbar.

Change-Id: I1b3ac31d2fa85c7ddca2b22644107c0718a13f7c
Task-number: QTCREATORBUG-14289
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-04-15 17:41:04 +02:00
parent d1a7176f1c
commit 598a4c46ed
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/targetsettingswidget.cpp
View File

@@ -139,7 +139,10 @@ QString TargetSettingsWidget::targetNameAt(int index) const
void TargetSettingsWidget::setCentralWidget(QWidget *widget) void TargetSettingsWidget::setCentralWidget(QWidget *widget)
{ {
ui->scrollArea->setWidget(widget); if (m_centralWidget)
ui->scrollAreaWidgetContents->layout()->removeWidget(m_centralWidget);
m_centralWidget = widget;
ui->scrollAreaWidgetContents->layout()->addWidget(m_centralWidget);
} }
int TargetSettingsWidget::targetCount() const int TargetSettingsWidget::targetCount() const

1
src/plugins/projectexplorer/targetsettingswidget.h
View File

@@ -83,6 +83,7 @@ private:
TargetSelector *m_targetSelector; TargetSelector *m_targetSelector;
QPushButton *m_addButton; QPushButton *m_addButton;
QPushButton *m_manageButton; QPushButton *m_manageButton;
QWidget *m_centralWidget = 0;
}; };
} // namespace Internal } // namespace Internal

40
src/plugins/projectexplorer/targetsettingswidget.ui
View File

@@ -17,7 +17,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@@ -130,23 +139,24 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QWidget" name="scrollAreaWidgetContents" native="true">
<property name="frameShape"> <layout class="QVBoxLayout" name="verticalLayout_3">
<enum>QFrame::NoFrame</enum> <property name="spacing">
<number>0</number>
</property> </property>
<property name="widgetResizable"> <property name="leftMargin">
<bool>true</bool> <number>0</number>
</property> </property>
<widget class="QWidget" name="scrollAreaWidgetContents"> <property name="topMargin">
<property name="geometry"> <number>0</number>
<rect>
<x>0</x>
<y>0</y>
<width>618</width>
<height>424</height>
</rect>
</property> </property>
</widget> <property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>