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

CppEditor::OverViewTreeView: Don't depend on ICore::mainWindow()

Browse Source 
Change-Id: Ic212807eda4a56f54fd5c8f37c5ab1645b74243f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2014-04-24 12:29:39 +02:00
parent 71fb8aa3b2
commit 13af3e9d1e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -39,7 +39,6 @@
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/icore.h>
#include <cpptools/cpptoolseditorsupport.h> #include <cpptools/cpptoolseditorsupport.h>
#include <cpptools/cpptoolsplugin.h> #include <cpptools/cpptoolsplugin.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
@@ -112,11 +111,10 @@ public:
expandAll(); expandAll();
} }
void adjustWidth() void adjustWidth(int width)
{ {
const int w = Core::ICore::mainWindow()->geometry().width(); setMaximumWidth(width);
setMaximumWidth(w); setMinimumWidth(qMin(qMax(sizeHintForColumn(0), minimumSizeHint().width()), width));
setMinimumWidth(qMin(qMax(sizeHintForColumn(0), minimumSizeHint().width()), w));
} }
}; };
@@ -139,7 +137,7 @@ public:
void showPopup() void showPopup()
{ {
static_cast<OverviewTreeView *>(view())->adjustWidth(); static_cast<OverviewTreeView *>(view())->adjustWidth(topLevelWidget()->geometry().width());
QComboBox::showPopup(); QComboBox::showPopup();
} }