diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-02-24 20:37:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-25 21:12:08 +0100 |
commit | 27272097e6492ac8919a3132d28e72aa9645bebc (patch) | |
tree | f3e9092140a2f0cfde90b217099050d11aceeca3 /vcl | |
parent | d37b9b2f9d6340a4f100f764b02e6f562072c004 (diff) |
dockwin.hxx doesn't need to include floatwin.hxx
Change-Id: Ib0408f715c9a12f32ce2f8049d2c9c7272201d76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111504
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/app/salvtables.cxx | 1 | ||||
-rw-r--r-- | vcl/source/control/calendar.cxx | 1 | ||||
-rw-r--r-- | vcl/source/window/dockwin.cxx | 41 | ||||
-rw-r--r-- | vcl/source/window/taskpanelist.cxx | 1 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 1 | ||||
-rw-r--r-- | vcl/source/window/toolbox2.cxx | 1 |
6 files changed, 46 insertions, 0 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7bb05907ecba..207708bf56d5 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -47,6 +47,7 @@ #include <tools/helpers.hxx> #include <vcl/abstdlg.hxx> #include <vcl/builder.hxx> +#include <vcl/floatwin.hxx> #include <vcl/toolkit/combobox.hxx> #include <vcl/toolkit/dialog.hxx> #include <vcl/toolkit/fixed.hxx> diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index efcfc0c63800..68c4d74950ef 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -26,6 +26,7 @@ #include <vcl/toolkit/calendar.hxx> #include <vcl/commandevent.hxx> #include <vcl/dockwin.hxx> +#include <vcl/floatwin.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/Weekdays.hpp> diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 8689e914bfd1..498ebdfbb9f4 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -1058,6 +1058,47 @@ IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Timer*, void) setPosSizeOnContainee(); } +void DockingWindow::RollDown() +{ + if ( mpFloatWin ) + mpFloatWin->RollDown(); + mbRollUp = false; +} + +bool DockingWindow::IsRollUp() const +{ + if ( mpFloatWin ) + return mpFloatWin->IsRollUp(); + return mbRollUp; +} + +void DockingWindow::SetMinOutputSizePixel( const Size& rSize ) +{ + if ( mpFloatWin ) + mpFloatWin->SetMinOutputSizePixel( rSize ); + maMinOutSize = rSize; +} + +const Size& DockingWindow::GetMinOutputSizePixel() const +{ + if ( mpFloatWin ) + return mpFloatWin->GetMinOutputSizePixel(); + return maMinOutSize; +} + +void DockingWindow::SetFloatingPos( const Point& rNewPos ) +{ + if ( mpFloatWin ) + mpFloatWin->SetPosPixel( rNewPos ); + else + maFloatPos = rNewPos; +} + +void DockingWindow::SetIdleDebugName( const char *pDebugName ) +{ + maLayoutIdle.SetDebugName( pDebugName ); +} + DropdownDockingWindow::DropdownDockingWindow(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame, bool bTearable) : DockingWindow(pParent, !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 1cfb8ba92757..20ec9db82c5f 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -18,6 +18,7 @@ */ #include <vcl/dockwin.hxx> +#include <vcl/floatwin.hxx> #include <vcl/taskpanelist.hxx> #include <svdata.hxx> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 49f7765a7b01..eff09817c4a0 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -21,6 +21,7 @@ #include <vcl/commandinfoprovider.hxx> #include <vcl/event.hxx> #include <vcl/decoview.hxx> +#include <vcl/floatwin.hxx> #include <vcl/accel.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 4336a0975901..06569732a145 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/idle.hxx> #include <vcl/bitmap.hxx> +#include <vcl/floatwin.hxx> #include <vcl/toolbox.hxx> #include <vcl/mnemonic.hxx> #include <vcl/menu.hxx> |