move layout from dialog to systemwindow

*distant sounds of hammering in basement*

so we can get Floating Windows layout aware
as well without duplicate of dialog layout logic

Change-Id: I063375f2f7d4e5c3bfbfedf55649078d4dbe4139

4 files changed, 178 insertions, 134 deletions

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 65cf06cacd0c..636e2278535a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -176,7 +176,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString&
     , m_pParserState(new ParserState)
     , m_xFrame(rFrame)
 {
-    m_bToplevelHasDeferredInit = pParent && pParent->IsDialog() && ((Dialog*)pParent)->isDeferredInit();
+    m_bToplevelHasDeferredInit = pParent && pParent->IsDialog() && static_cast<Dialog*>(pParent)->isDeferredInit();
     m_bToplevelHasDeferredProperties = m_bToplevelHasDeferredInit;
 
     sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
@@ -1663,7 +1663,7 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass,
         //toplevels default to resizable
         if (pCurrentChild->IsDialog())
         {
-            Dialog *pDialog = (Dialog*)pCurrentChild;
+            Dialog *pDialog = static_cast<Dialog*>(pCurrentChild);
             pDialog->doDeferredInit(extractResizable(rProps));
             m_bToplevelHasDeferredInit = false;
         }
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index f8afa9f8ae8c..1fa6f40c9994 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -347,13 +347,8 @@ void Dialog::ImplInitDialogData()
     mbModalMode             = false;
     mpContentArea           = NULL;
     mpActionArea            = NULL;
-    mbIsCalculatingInitialLayoutSize = false;
     mnMousePositioned       = 0;
     mpDialogImpl            = new DialogImpl;
-
-    //To-Do, reuse maResizeTimer
-    maLayoutTimer.SetTimeout(50);
-    maLayoutTimer.SetTimeoutHdl( LINK( this, Dialog, ImplHandleLayoutTimerHdl ) );
 }
 
 void Dialog::ImplInit( Window* pParent, WinBits nStyle )
@@ -531,9 +526,24 @@ void Dialog::set_content_area(VclBox* pContentArea)
     mpContentArea = pContentArea;
 }
 
+void Dialog::settingOptimalLayoutSize(VclBox *pBox)
+{
+    const DialogStyle& rDialogStyle =
+        GetSettings().GetStyleSettings().GetDialogStyle();
+    pBox->set_border_width(rDialogStyle.content_area_border);
+    pBox->set_spacing(pBox->get_spacing() +
+        rDialogStyle.content_area_spacing);
+
+    VclButtonBox *pActionArea = getActionArea(this);
+    if (pActionArea)
+    {
+        pActionArea->set_border_width(rDialogStyle.action_area_border);
+        pActionArea->set_spacing(rDialogStyle.button_spacing);
+    }
+}
+
 Dialog::~Dialog()
 {
-    maLayoutTimer.Stop();
     delete mpDialogImpl;
     mpDialogImpl = NULL;
 }
@@ -614,54 +624,14 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
     return Size(w, h);
 }
 
-void Dialog::setOptimalLayoutSize()
-{
-    maLayoutTimer.Stop();
-
-    //resize dialog to fit requisition on initial show
-    VclBox *pBox = static_cast<VclBox*>(GetWindow(WINDOW_FIRSTCHILD));
-
-    const DialogStyle& rDialogStyle =
-        GetSettings().GetStyleSettings().GetDialogStyle();
-    pBox->set_border_width(rDialogStyle.content_area_border);
-    pBox->set_spacing(pBox->get_spacing() +
-        rDialogStyle.content_area_spacing);
-
-    VclButtonBox *pActionArea = getActionArea(this);
-    if (pActionArea)
-    {
-        pActionArea->set_border_width(rDialogStyle.action_area_border);
-        pActionArea->set_spacing(rDialogStyle.button_spacing);
-    }
-
-    Size aSize = get_preferred_size();
-
-    Size aMax(bestmaxFrameSizeForScreenSize(GetDesktopRectPixel().GetSize()));
-
-    aSize.Width() = std::min(aMax.Width(), aSize.Width());
-    aSize.Height() = std::min(aMax.Height(), aSize.Height());
-
-    SetMinOutputSizePixel(aSize);
-    SetSizePixel(aSize);
-    setPosSizeOnContainee(aSize, *pBox);
-}
-
 void Dialog::StateChanged( StateChangedType nType )
 {
-    SystemWindow::StateChanged( nType );
-
-    if ( nType == STATE_CHANGE_INITSHOW )
+    if (nType == STATE_CHANGE_INITSHOW)
     {
         if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
             ImplWindowAutoMnemonic( this );
 
-        if (isLayoutEnabled())
-        {
-            mbIsCalculatingInitialLayoutSize = true;
-            setDeferredProperties();
-            setOptimalLayoutSize();
-            mbIsCalculatingInitialLayoutSize = false;
-        }
+        DoInitialLayout();
 
         if ( !HasChildPathFocus() || HasFocus() )
             GrabFocusToFirstControl();
@@ -676,7 +646,10 @@ void Dialog::StateChanged( StateChangedType nType )
 
         ImplMouseAutoPos( this );
     }
-    else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
+
+    SystemWindow::StateChanged( nType );
+
+    if (nType == STATE_CHANGE_CONTROLBACKGROUND)
     {
         ImplInitSettings();
         Invalidate();
@@ -1166,75 +1139,11 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal
     pDev->Pop();
 }
 
-bool Dialog::isLayoutEnabled() const
-{
-    //pre dtor called, and single child is a container => we're layout enabled
-    return mpDialogImpl && ::isLayoutEnabled(this);
-}
-
-Size Dialog::GetOptimalSize() const
-{
-    if (!isLayoutEnabled())
-        return SystemWindow::GetOptimalSize();
-
-    Size aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD));
-
-    sal_Int32 nBorderWidth = get_border_width();
-
-    aSize.Height() += mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder
-        + 2*nBorderWidth;
-    aSize.Width() += mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder
-        + 2*nBorderWidth;
-
-    return Window::CalcWindowSize(aSize);
-}
-
-void Dialog::setPosSizeOnContainee(Size aSize, VclContainer &rBox)
-{
-    sal_Int32 nBorderWidth = get_border_width();
-
-    aSize.Width() -= mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder
-        + 2 * nBorderWidth;
-    aSize.Height() -= mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder
-        + 2 * nBorderWidth;
-
-    Point aPos(mpWindowImpl->mnLeftBorder + nBorderWidth,
-        mpWindowImpl->mnTopBorder + nBorderWidth);
-
-    VclContainer::setLayoutAllocation(rBox, aPos, aSize);
-}
-
-IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, EMPTYARG )
+void Dialog::queue_resize(StateChangedType eReason)
 {
-    if (!isLayoutEnabled())
-    {
-        SAL_WARN("vcl.layout", "Dialog has become non-layout because extra children have been added directly to it.");
-        return 0;
-    }
-
-    VclBox *pBox = static_cast<VclBox*>(GetWindow(WINDOW_FIRSTCHILD));
-    assert(pBox);
-    setPosSizeOnContainee(GetSizePixel(), *pBox);
-    return 0;
-}
-
-void Dialog::queue_resize(StateChangedType /*eReason*/)
-{
-    if (hasPendingLayout() || isCalculatingInitialLayoutSize())
-        return;
     if (IsInClose())
         return;
-    if (!isLayoutEnabled())
-        return;
-    WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
-    pWindowImpl->mnOptimalWidthCache = -1;
-    pWindowImpl->mnOptimalHeightCache = -1;
-    maLayoutTimer.Start();
-}
-
-void Dialog::Resize()
-{
-    queue_resize();
+    SystemWindow::queue_resize(eReason);
 }
 
 bool Dialog::set_property(const OString &rKey, const OString &rValue)
@@ -1246,18 +1155,6 @@ bool Dialog::set_property(const OString &rKey, const OString &rValue)
     return true;
 }
 
-void Dialog::SetText(const OUString& rStr)
-{
-    setDeferredProperties();
-    SystemWindow::SetText(rStr);
-}
-
-OUString Dialog::GetText() const
-{
-    const_cast<Dialog*>(this)->setDeferredProperties();
-    return SystemWindow::GetText();
-}
-
 VclBuilderContainer::VclBuilderContainer()
     : m_pUIBuilder(NULL)
 {
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 18fab8a0258d..9255cc61c279 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -284,7 +284,7 @@ void Window::ImplPostPaint()
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl)
 {
     // save paint events until layout is done
-    if (!ImplDoTiledRendering() && IsDialog() && static_cast<const Dialog*>(this)->hasPendingLayout())
+    if (!ImplDoTiledRendering() && IsSystemWindow() && static_cast<const SystemWindow*>(this)->hasPendingLayout())
     {
         mpWindowImpl->mpFrameData->maPaintTimer.Start();
         return 0;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index c4077a199afc..a3e6ef7b395e 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -23,6 +23,7 @@
 
 #include <tools/debug.hxx>
 
+#include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/event.hxx>
@@ -60,12 +61,10 @@ SystemWindow::ImplData::ImplData()
 
 SystemWindow::ImplData::~ImplData()
 {
-    if( mpTaskPaneList )
-        delete mpTaskPaneList;
+    delete mpTaskPaneList;
 }
 
-SystemWindow::SystemWindow( WindowType nType ) :
-    Window( nType )
+void SystemWindow::Init()
 {
     mpImplData          = new ImplData;
     mpWindowImpl->mbSysWin            = true;
@@ -78,12 +77,32 @@ SystemWindow::SystemWindow( WindowType nType ) :
     mbDockBtn           = false;
     mbHideBtn           = false;
     mbSysChild          = false;
+    mbIsCalculatingInitialLayoutSize = false;
+    mbInitialLayoutDone = false;
     mnMenuBarMode       = MENUBAR_MODE_NORMAL;
     mnIcon              = 0;
+
+    //To-Do, reuse maResizeTimer
+    maLayoutTimer.SetTimeout(50);
+    maLayoutTimer.SetTimeoutHdl( LINK( this, SystemWindow, ImplHandleLayoutTimerHdl ) );
+}
+
+SystemWindow::SystemWindow(WindowType nType)
+    : Window(nType)
+{
+    Init();
+}
+
+SystemWindow::SystemWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType)
+    : Window(pParent, nType)
+{
+    Init();
+    m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
 }
 
 SystemWindow::~SystemWindow()
 {
+    maLayoutTimer.Stop();
     delete mpImplData;
     mpImplData = NULL;
 }
@@ -965,4 +984,132 @@ const Link& SystemWindow::GetCloseHdl() const
     return mpImplData->maCloseHdl;
 }
 
+void SystemWindow::queue_resize(StateChangedType /*eReason*/)
+{
+    if (hasPendingLayout() || isCalculatingInitialLayoutSize())
+        return;
+    if (!isLayoutEnabled())
+        return;
+    WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl;
+    pWindowImpl->mnOptimalWidthCache = -1;
+    pWindowImpl->mnOptimalHeightCache = -1;
+    maLayoutTimer.Start();
+}
+
+void SystemWindow::Resize()
+{
+    queue_resize();
+}
+
+bool SystemWindow::isLayoutEnabled() const
+{
+    //pre dtor called, and single child is a container => we're layout enabled
+    return mpImplData && ::isLayoutEnabled(this);
+}
+
+Size SystemWindow::GetOptimalSize() const
+{
+    if (!isLayoutEnabled())
+        return Window::GetOptimalSize();
+
+    Size aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD));
+
+    sal_Int32 nBorderWidth = get_border_width();
+
+    aSize.Height() += mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder
+        + 2*nBorderWidth;
+    aSize.Width() += mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder
+        + 2*nBorderWidth;
+
+    return Window::CalcWindowSize(aSize);
+}
+
+void SystemWindow::setPosSizeOnContainee(Size aSize, VclContainer &rBox)
+{
+    sal_Int32 nBorderWidth = get_border_width();
+
+    aSize.Width() -= mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder
+        + 2 * nBorderWidth;
+    aSize.Height() -= mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder
+        + 2 * nBorderWidth;
+
+    Point aPos(mpWindowImpl->mnLeftBorder + nBorderWidth,
+        mpWindowImpl->mnTopBorder + nBorderWidth);
+
+    VclContainer::setLayoutAllocation(rBox, aPos, aSize);
+}
+
+IMPL_LINK( SystemWindow, ImplHandleLayoutTimerHdl, void*, EMPTYARG )
+{
+    if (!isLayoutEnabled())
+    {
+        SAL_WARN("vcl.layout", "SystemWindow has become non-layout because extra children have been added directly to it.");
+        return 0;
+    }
+
+    VclBox *pBox = static_cast<VclBox*>(GetWindow(WINDOW_FIRSTCHILD));
+    assert(pBox);
+    setPosSizeOnContainee(GetSizePixel(), *pBox);
+    return 0;
+}
+
+void SystemWindow::SetText(const OUString& rStr)
+{
+    setDeferredProperties();
+    Window::SetText(rStr);
+}
+
+OUString SystemWindow::GetText() const
+{
+    const_cast<SystemWindow*>(this)->setDeferredProperties();
+    return Window::GetText();
+}
+
+void SystemWindow::settingOptimalLayoutSize(VclBox* /*pBox*/)
+{
+}
+
+void SystemWindow::setOptimalLayoutSize()
+{
+    maLayoutTimer.Stop();
+
+    //resize SystemWindow to fit requisition on initial show
+    VclBox *pBox = static_cast<VclBox*>(GetWindow(WINDOW_FIRSTCHILD));
+
+    settingOptimalLayoutSize(pBox);
+
+    Size aSize = get_preferred_size();
+
+    Size aMax(bestmaxFrameSizeForScreenSize(GetDesktopRectPixel().GetSize()));
+
+    aSize.Width() = std::min(aMax.Width(), aSize.Width());
+    aSize.Height() = std::min(aMax.Height(), aSize.Height());
+
+    SetMinOutputSizePixel(aSize);
+    SetSizePixel(aSize);
+    setPosSizeOnContainee(aSize, *pBox);
+}
+
+void SystemWindow::DoInitialLayout()
+{
+    if (isLayoutEnabled())
+    {
+        mbIsCalculatingInitialLayoutSize = true;
+        setDeferredProperties();
+        setOptimalLayoutSize();
+        mbIsCalculatingInitialLayoutSize = false;
+        mbInitialLayoutDone = true;
+    }
+}
+
+void SystemWindow::StateChanged( StateChangedType nType )
+{
+    Window::StateChanged(nType);
+
+    if (nType == STATE_CHANGE_INITSHOW && !mbInitialLayoutDone)
+    {
+        DoInitialLayout();
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */