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 /include | |
| 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 'include')
| -rw-r--r-- | include/vcl/dockwin.hxx | 54 |
1 files changed, 6 insertions, 48 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 5de80d36432e..e86dc00a09c2 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -17,15 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_DOCKWIN_HXX -#define INCLUDED_VCL_DOCKWIN_HXX +#pragma once #include <vcl/dllapi.h> +#include <vcl/syswin.hxx> #include <o3tl/deleter.hxx> -#include <vcl/floatwin.hxx> #include <memory> #include <vector> +class ToolBox; +class FloatingWindow; +enum class FloatWinPopupFlags; + // data to be sent with docking events struct DockingData { @@ -335,49 +338,6 @@ public: virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; }; - -inline void DockingWindow::RollDown() -{ - if ( mpFloatWin ) - mpFloatWin->RollDown(); - mbRollUp = false; -} - -inline bool DockingWindow::IsRollUp() const -{ - if ( mpFloatWin ) - return mpFloatWin->IsRollUp(); - return mbRollUp; -} - - -inline void DockingWindow::SetMinOutputSizePixel( const Size& rSize ) -{ - if ( mpFloatWin ) - mpFloatWin->SetMinOutputSizePixel( rSize ); - maMinOutSize = rSize; -} - -inline const Size& DockingWindow::GetMinOutputSizePixel() const -{ - if ( mpFloatWin ) - return mpFloatWin->GetMinOutputSizePixel(); - return maMinOutSize; -} - -inline void DockingWindow::SetFloatingPos( const Point& rNewPos ) -{ - if ( mpFloatWin ) - mpFloatWin->SetPosPixel( rNewPos ); - else - maFloatPos = rNewPos; -} - -inline void DockingWindow::SetIdleDebugName( const char *pDebugName ) -{ - maLayoutIdle.SetDebugName( pDebugName ); -} - class VCL_DLLPUBLIC DropdownDockingWindow : public DockingWindow { protected: @@ -402,6 +362,4 @@ public: virtual void dispose() override; }; -#endif // INCLUDED_VCL_DOCKWIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |