Diffstat (limited to 'noncore/graphics/drawpad/drawpad.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index d9d0ce0..c0f42d9 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp | |||
@@ -46,13 +46,12 @@ | |||
46 | #include <qspinbox.h> | 46 | #include <qspinbox.h> |
47 | #include <qtoolbutton.h> | 47 | #include <qtoolbutton.h> |
48 | #include <qtooltip.h> | 48 | #include <qtooltip.h> |
49 | #include <qwhatsthis.h> | 49 | #include <qwhatsthis.h> |
50 | 50 | ||
51 | using namespace Opie::Ui; | 51 | using namespace Opie::Ui; |
52 | using namespace Opie::Ui; | ||
53 | DrawPad::DrawPad(QWidget* parent, const char* name, WFlags /*fl*/ ) | 52 | DrawPad::DrawPad(QWidget* parent, const char* name, WFlags /*fl*/ ) |
54 | : QMainWindow(parent, name, WStyle_ContextHelp) | 53 | : QMainWindow(parent, name, WStyle_ContextHelp) |
55 | { | 54 | { |
56 | // init members | 55 | // init members |
57 | connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), | 56 | connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), |
58 | this, SLOT(slotAppMessage(const QCString&, const QByteArray&)) ); | 57 | this, SLOT(slotAppMessage(const QCString&, const QByteArray&)) ); |
@@ -278,13 +277,16 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags /*fl*/ ) | |||
278 | QToolTip::add(m_pBrushColorToolButton, tr("Fill Color")); | 277 | QToolTip::add(m_pBrushColorToolButton, tr("Fill Color")); |
279 | m_pBrushColorToolButton->setPopup(brushColorPopupMenu); | 278 | m_pBrushColorToolButton->setPopup(brushColorPopupMenu); |
280 | m_pBrushColorToolButton->setPopupDelay(0); | 279 | m_pBrushColorToolButton->setPopupDelay(0); |
281 | 280 | ||
282 | changeBrushColor(Qt::white); | 281 | changeBrushColor(Qt::white); |
283 | 282 | ||
284 | finishStartup(); | 283 | // delay the rest of the initialization and do it from within the mainloop |
284 | // if we don't do this, the widget layout may not be constructed upon | ||
285 | // and we will end up with a wrong QScrollview page size (Mickeyl) | ||
286 | QTimer::singleShot( 100, this, SLOT( finishStartup() ) ); | ||
285 | } | 287 | } |
286 | 288 | ||
287 | 289 | ||
288 | void DrawPad::finishStartup() | 290 | void DrawPad::finishStartup() |
289 | { | 291 | { |
290 | // init pages | 292 | // init pages |