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

Remove unused "suppressed" property from navigation widget

Browse Source 
Change-Id: I7e94b258991b9211156c75a4475b468b585b00f5
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2017-04-20 11:30:06 +02:00
parent 1050c8605c
commit 5b3ed3f9cb
3 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -212,15 +212,8 @@ NavigationWidget *MainWindow::navigationWidget(Side side) const
void MainWindow::setSidebarVisible(bool visible, Side side) void MainWindow::setSidebarVisible(bool visible, Side side)
{ {
if (NavigationWidgetPlaceHolder::current(side)) { if (NavigationWidgetPlaceHolder::current(side))
NavigationWidget *navWidget = navigationWidget(side); navigationWidget(side)->setShown(visible);
if (navWidget->isSuppressed() && visible) {
navWidget->setShown(true);
navWidget->setSuppressed(false);
} else {
navWidget->setShown(visible);
}
}
} }
void MainWindow::setOverrideColor(const QColor &color) void MainWindow::setOverrideColor(const QColor &color)

18
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -166,7 +166,6 @@ struct NavigationWidgetPrivate
QStandardItemModel *m_factoryModel; QStandardItemModel *m_factoryModel;
bool m_shown; bool m_shown;
bool m_suppressed;
int m_width; int m_width;
QAction *m_toggleSideBarAction; // does not take ownership QAction *m_toggleSideBarAction; // does not take ownership
Side m_side; Side m_side;
@@ -183,7 +182,6 @@ struct NavigationWidgetPrivate
NavigationWidgetPrivate::NavigationWidgetPrivate(QAction *toggleSideBarAction, Side side) : NavigationWidgetPrivate::NavigationWidgetPrivate(QAction *toggleSideBarAction, Side side) :
m_factoryModel(new QStandardItemModel), m_factoryModel(new QStandardItemModel),
m_shown(true), m_shown(true),
m_suppressed(false),
m_width(0), m_width(0),
m_toggleSideBarAction(toggleSideBarAction), m_toggleSideBarAction(toggleSideBarAction),
m_side(side) m_side(side)
@@ -508,7 +506,7 @@ void NavigationWidget::setShown(bool b)
d->m_shown = b; d->m_shown = b;
NavigationWidgetPlaceHolder *current = NavigationWidgetPlaceHolder::current(d->m_side); NavigationWidgetPlaceHolder *current = NavigationWidgetPlaceHolder::current(d->m_side);
if (current) { if (current) {
bool visible = d->m_shown && !d->m_suppressed && haveData; bool visible = d->m_shown && haveData;
current->setVisible(visible); current->setVisible(visible);
d->m_toggleSideBarAction->setChecked(visible); d->m_toggleSideBarAction->setChecked(visible);
} else { } else {
@@ -522,20 +520,6 @@ bool NavigationWidget::isShown() const
return d->m_shown; return d->m_shown;
} }
bool NavigationWidget::isSuppressed() const
{
return d->m_suppressed;
}
void NavigationWidget::setSuppressed(bool b)
{
if (d->m_suppressed == b)
return;
d->m_suppressed = b;
if (NavigationWidgetPlaceHolder::current(d->m_side))
NavigationWidgetPlaceHolder::current(d->m_side)->setVisible(d->m_shown && !d->m_suppressed);
}
int NavigationWidget::factoryIndex(Id id) int NavigationWidget::factoryIndex(Id id)
{ {
for (int row = 0; row < d->m_factoryModel->rowCount(); ++row) { for (int row = 0; row < d->m_factoryModel->rowCount(); ++row) {

3
src/plugins/coreplugin/navigationwidget.h
View File

@@ -95,9 +95,6 @@ public:
bool isShown() const; bool isShown() const;
void setShown(bool b); void setShown(bool b);
bool isSuppressed() const;
void setSuppressed(bool b);
static NavigationWidget *instance(Side side); static NavigationWidget *instance(Side side);
static QWidget *activateSubWidget(Id factoryId, Side fallbackSide); static QWidget *activateSubWidget(Id factoryId, Side fallbackSide);