Commit c0dda8b2 authored by Daniel Teske's avatar Daniel Teske
Browse files

AndroidManifestEditor: Make widget better at resizing to small sizes



Task-number: QTCREATORBUG-11394
Change-Id: If2c18df0db85063146ed9dc09351844924e22bdc
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent c3c84c7b
...@@ -98,7 +98,7 @@ Project *androidProject(const QString &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() ...@@ -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() ...@@ -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);
......
...@@ -35,6 +35,7 @@ ...@@ -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: ...@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment