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

Make "close view" buttons more consistent

Browse Source 
Use the same icons that we already use for editor splits.

Change-Id: Ice052f637968918a15b16e00a39c5dbc06948dbc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-01-19 17:07:49 +01:00
parent 642dc36ecb
commit 58feec49bf
7 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/sidebar.cpp
View File

@@ -30,6 +30,7 @@
#include "sidebar.h"
#include "sidebarwidget.h"
#include "coreconstants.h"
#include "actionmanager/command.h"
#include <utils/algorithm.h>
@@ -202,12 +203,18 @@ SideBarItem *SideBar::item(const QString &id)
Internal::SideBarWidget *SideBar::insertSideBarWidget(int position, const QString &id)
{
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_BOTTOM)));
Internal::SideBarWidget *item = new Internal::SideBarWidget(this, id);
connect(item, SIGNAL(splitMe()), this, SLOT(splitSubWidget()));
connect(item, SIGNAL(closeMe()), this, SLOT(closeSubWidget()));
connect(item, SIGNAL(currentWidgetChanged()), this, SLOT(updateWidgets()));
insertWidget(position, item);
d->m_widgets.insert(position, item);
if (d->m_widgets.size() == 1)
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
else
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
updateWidgets();
return item;
}
@@ -235,6 +242,11 @@ void SideBar::closeSubWidget()
if (!widget)
return;
removeSideBarWidget(widget);
// update close button of top item
if (d->m_widgets.size() == 1)
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_LEFT)));
else
d->m_widgets.at(0)->setCloseIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_SPLIT_TOP)));
updateWidgets();
} else {
if (d->m_closeWhenEmpty) {