diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-16 16:14:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-16 21:15:09 +0100 |
| commit | 6bc3b6cfc72d157fb43c88e754f6ed4f53aac16e (patch) | |
| tree | bba95d0363be83058a3ce0e9a607c1891a8bfc3d /include/vcl/toolkit | |
| parent | b3dce1e23a087fbc7c61409c1f2f1f8e6de5beaa (diff) | |
move FixedImage to toolkit-only headers
Change-Id: I7ae18ef3225b4ca1448a2a3b0fccfc2206f7a5ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110995
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/toolkit')
| -rw-r--r-- | include/vcl/toolkit/fixed.hxx | 36 | ||||
| -rw-r--r-- | include/vcl/toolkit/imgctrl.hxx | 2 |
2 files changed, 37 insertions, 1 deletions
diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 90d19afe43bc..2598b2497d02 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -90,4 +90,40 @@ public: void SetBitmap( const BitmapEx& rBitmap ); }; +class VCL_DLLPUBLIC FixedImage : public Control +{ +private: + Image maImage; + +private: + using Control::ImplInitSettings; + using Window::ImplInit; + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle ); + +protected: + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, + const Point& rPos, const Size& rSize ); +public: + explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); + + virtual void ApplySettings(vcl::RenderContext&) override; + + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; + virtual void Draw( OutputDevice* pDev, const Point& rPos, DrawFlags nFlags ) override; + virtual void Resize() override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; + virtual Size GetOptimalSize() const override; + + void SetImage( const Image& rImage ); + const Image& GetImage() const { return maImage; } + + void SetModeImage( const Image& rImage ); + const Image& GetModeImage( ) const { return maImage;} + virtual bool set_property(const OString &rKey, const OUString &rValue) override; + + static Image loadThemeImage(const OUString &rFileName); +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/imgctrl.hxx b/include/vcl/toolkit/imgctrl.hxx index 00ac76faeeb2..3e2b9c5bbd89 100644 --- a/include/vcl/toolkit/imgctrl.hxx +++ b/include/vcl/toolkit/imgctrl.hxx @@ -26,7 +26,7 @@ #include <config_options.h> #include <vcl/dllapi.h> -#include <vcl/fixed.hxx> +#include <vcl/toolkit/fixed.hxx> class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ImageControl : public FixedImage { |