diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-06 16:08:50 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-06 20:54:55 +0200 |
commit | fca8704954c9e38719ac0158ba66edd8d85522ed (patch) | |
tree | eaa58a56a0bbe3eb1c96e90db1e199c92a3049d0 /toolkit | |
parent | 8a63cdd32c4eb348cb6625b4be6739fe391cb0b4 (diff) |
make scrollabledialog.hxx a private header
Change-Id: I16c68436c35568867677c33f70ef48287bc9e8ac
Reviewed-on: https://gerrit.libreoffice.org/61470
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/inc/helper/scrollabledialog.hxx | 67 | ||||
-rw-r--r-- | toolkit/source/awt/scrollabledialog.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxcontainer.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 2 |
5 files changed, 71 insertions, 4 deletions
diff --git a/toolkit/inc/helper/scrollabledialog.hxx b/toolkit/inc/helper/scrollabledialog.hxx new file mode 100644 index 000000000000..14bc87ab027c --- /dev/null +++ b/toolkit/inc/helper/scrollabledialog.hxx @@ -0,0 +1,67 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX +#define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX + +#include <vcl/dialog.hxx> +#include <vcl/scrbar.hxx> + + +namespace toolkit +{ + class ScrollableDialog : public Dialog + { + public: + enum ScrollBarVisibility { None, Vert, Hori, Both }; + + private: + VclPtr<ScrollBar> maHScrollBar; + VclPtr<ScrollBar> maVScrollBar; + Size maScrollArea; + bool mbHasHoriBar; + bool mbHasVertBar; + Point mnScrollPos; + long mnScrWidth; + ScrollBarVisibility maScrollVis; + + void lcl_Scroll( long nX, long nY ); + DECL_LINK( ScrollBarHdl, ScrollBar*, void ); + + public: + ScrollableDialog( vcl::Window* pParent, WinBits nStyle, Dialog::InitFlag eFlag = Dialog::InitFlag::Default ); + virtual ~ScrollableDialog() override; + virtual void dispose() override; + // Window + virtual void Resize() override; + + void SetScrollWidth( long nWidth ); + void SetScrollHeight( long nHeight ); + void SetScrollLeft( long nLeft ); + void SetScrollTop( long Top ); + void setScrollVisibility( ScrollBarVisibility rState ); + void ResetScrollBars(); + }; + +} // namespacetoolkit + + +#endif // INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index 3751ad5f29b9..fe0da4118e3f 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/awt/scrollabledialog.hxx> +#include <helper/scrollabledialog.hxx> #include <vcl/group.hxx> #include <vcl/settings.hxx> diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 27be3f5e6c98..708f2e6ed420 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -27,7 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <tools/debug.hxx> -#include <toolkit/awt/scrollabledialog.hxx> +#include <helper/scrollabledialog.hxx> #include <toolkit/helper/property.hxx> diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 737bdc529554..d65bf794dc88 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -124,10 +124,10 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> -#include <toolkit/awt/scrollabledialog.hxx> #include <comphelper/profilezone.hxx> #include <helper/msgbox.hxx> +#include <helper/scrollabledialog.hxx> #include <helper/unowrapper.hxx> #if defined(_WIN32) diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 504dfa8e8a78..f56d8b224056 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -18,7 +18,7 @@ */ #include <toolkit/awt/vclxwindows.hxx> -#include <toolkit/awt/scrollabledialog.hxx> +#include <helper/scrollabledialog.hxx> #include <com/sun/star/awt/ScrollBarOrientation.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> |