diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-02 16:18:43 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-11 14:29:54 +0100 |
| commit | d764415977ad65bb4a657ccada7c9b2c19b689e1 (patch) | |
| tree | 8f2a84b795e9a4cf5036dae0984c9ed2937933a7 /include | |
| parent | feb8164afa67d3e2e5fe27dd01c5101d6d0cb847 (diff) | |
merge panel and panel title
so one combined InterimItemWindow instead of two separate ones
for each panel
Change-Id: Ie8e1b6a28f124ef23cf88ec47442ccf15ab51d3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111903
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sidebar/Panel.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index ea4a81870744..cd820ff937b2 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -20,7 +20,7 @@ #include <sfx2/dllapi.h> -#include <vcl/window.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vector> @@ -51,7 +51,7 @@ class Context; * Multiple panels form a single deck. * E.g. the Properties deck has panels like Styles, Character, paragraph. */ -class SFX2_DLLPUBLIC Panel final : public vcl::Window +class SFX2_DLLPUBLIC Panel final : public InterimItemWindow { public: Panel(const PanelDescriptor& rPanelDescriptor, vcl::Window* pParentWindow, @@ -62,13 +62,15 @@ public: virtual ~Panel() override; virtual void dispose() override; - VclPtr<PanelTitleBar> const& GetTitleBar() const; + PanelTitleBar* GetTitleBar() const; + void ShowTitlebar(bool bShowTitlebar); bool IsTitleBarOptional() const { return mbIsTitleBarOptional; } void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement); const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const { return mxPanelComponent; } + css::uno::Reference<css::awt::XWindow> GetElementParentWindow() const { return mxXWindow; } css::uno::Reference<css::awt::XWindow> GetElementWindow(); void SetExpanded(const bool bIsExpanded); bool IsExpanded() const { return mbIsExpanded; } @@ -80,7 +82,6 @@ public: void SetLurkMode(bool bLurk); bool IsLurking() const { return mbLurking; } - virtual void Resize() override; virtual void DataChanged(const DataChangedEvent& rEvent) override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; virtual void DumpAsPropertyTree(tools::JsonWriter&) override; @@ -95,7 +96,9 @@ private: const std::function<void()> maDeckLayoutTrigger; const std::function<Context()> maContextAccess; const css::uno::Reference<css::frame::XFrame>& mxFrame; - VclPtr<PanelTitleBar> mpTitleBar; + std::unique_ptr<PanelTitleBar> mxTitleBar; + std::unique_ptr<weld::Container> mxContents; + css::uno::Reference<css::awt::XWindow> mxXWindow; }; typedef std::vector<VclPtr<Panel>> SharedPanelContainer; |