From c0dda8b2bb2a54896a7512e3ca7122ea8c89460f Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Tue, 4 Feb 2014 13:22:50 +0100
Subject: [PATCH] AndroidManifestEditor: Make widget better at resizing to
 small sizes

Task-number: QTCREATORBUG-11394
Change-Id: If2c18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/android/androidmanifesteditorwidget.cpp | 10 +++++-----
 src/plugins/android/androidmanifesteditorwidget.h   |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index a011d1a7a2e..39534f0c2d1 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -98,7 +98,7 @@ Project *androidProject(const QString &file)
 } // anonymous namespace
 
 AndroidManifestEditorWidget::AndroidManifestEditorWidget()
-    : QWidget(),
+    : QScrollArea(),
       m_dirty(false),
       m_stayClean(false),
       m_setAppName(false),
@@ -114,6 +114,8 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget()
 
     m_editor = new AndroidManifestEditor(this);
 
+    setWidgetResizable(true);
+
     connect(&m_timerParseCheck, SIGNAL(timeout()),
             this, SLOT(delayedParseCheck()));
 
@@ -123,10 +125,8 @@ AndroidManifestEditorWidget::AndroidManifestEditorWidget()
 
 void AndroidManifestEditorWidget::initializePage()
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    m_stackedWidget = new QStackedWidget(this); // simplfy make AndroidManifestEditorWidget a stacked widget
-    layout->addWidget(m_stackedWidget);
+    m_stackedWidget = new QStackedWidget(this);
+    setWidget(m_stackedWidget);
 
     Core::IContext *myContext = new Core::IContext(this);
     myContext->setWidget(m_stackedWidget);
diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 958a9364160..ab19800e2f5 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -35,6 +35,7 @@
 
 #include <QAbstractListModel>
 #include <QStackedWidget>
+#include <QScrollArea>
 #include <QTimer>
 
 QT_BEGIN_NAMESPACE
@@ -84,7 +85,7 @@ protected:
     AndroidManifestEditorWidget *m_parent;
 };
 
-class AndroidManifestEditorWidget : public QWidget
+class AndroidManifestEditorWidget : public QScrollArea
 {
     Q_OBJECT
 public: