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

AndroidManifestEditor: Make widget better at resizing to small sizes

Browse Source 
Task-number: QTCREATORBUG-11394
Change-Id: If2c18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2014-02-04 13:22:50 +01:00
parent c3c84c7b39
commit c0dda8b2bb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -98,7 +98,7 @@ Project *androidProject(const QString &file)
} // anonymous namespace } // anonymous namespace
AndroidManifestEditorWidget::AndroidManifestEditorWidget() AndroidManifestEditorWidget::AndroidManifestEditorWidget()
: QWidget(), : QScrollArea(),
m_dirty(false), m_dirty(false),
m_stayClean(false), m_stayClean(false),
m_setAppName(false), m_setAppName(false),
@@ -114,6 +114,8 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget()
m_editor = new AndroidManifestEditor(this); m_editor = new AndroidManifestEditor(this);
setWidgetResizable(true);
connect(&m_timerParseCheck, SIGNAL(timeout()), connect(&m_timerParseCheck, SIGNAL(timeout()),
this, SLOT(delayedParseCheck())); this, SLOT(delayedParseCheck()));
@@ -123,10 +125,8 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget()
void AndroidManifestEditorWidget::initializePage() void AndroidManifestEditorWidget::initializePage()
{ {
QHBoxLayout *layout = new QHBoxLayout(this); m_stackedWidget = new QStackedWidget(this);
layout->setMargin(0); setWidget(m_stackedWidget);
m_stackedWidget = new QStackedWidget(this); // simplfy make AndroidManifestEditorWidget a stacked widget
layout->addWidget(m_stackedWidget);
Core::IContext *myContext = new Core::IContext(this); Core::IContext *myContext = new Core::IContext(this);
myContext->setWidget(m_stackedWidget); myContext->setWidget(m_stackedWidget);

3
src/plugins/android/androidmanifesteditorwidget.h
View File

@@ -35,6 +35,7 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QStackedWidget> #include <QStackedWidget>
#include <QScrollArea>
#include <QTimer> #include <QTimer>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@@ -84,7 +85,7 @@ protected:
AndroidManifestEditorWidget *m_parent; AndroidManifestEditorWidget *m_parent;
}; };
class AndroidManifestEditorWidget : public QWidget class AndroidManifestEditorWidget : public QScrollArea
{ {
Q_OBJECT Q_OBJECT
public: public: