diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-28 15:38:32 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-29 12:25:20 +0200 |
| commit | a30e71bc1184d30bc9c95c2e02779660d58e3be9 (patch) | |
| tree | 5a08f547ac953ed4d542cac86648b950b062b7fd /include/svx | |
| parent | b206dda731e7c4390d6c9fe9c66feb8e903d3786 (diff) | |
sidebar: unify LineWidthPopup with other WeldToolbarPopups
Change-Id: I9dd0d2b223972683a9066f0069e055175349526f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118023
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119654
Tested-by: Jenkins
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/sidebar/LineWidthPopup.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index d16f49b60389..262f3540941b 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -23,6 +23,7 @@ #include <vcl/customweld.hxx> #include <vcl/image.hxx> #include <vcl/weld.hxx> +#include <svtools/toolbarmenu.hxx> #include <array> class ValueSet; @@ -32,7 +33,7 @@ namespace svx::sidebar class LinePropertyPanelBase; class LineWidthValueSet; -class LineWidthPopup final +class LineWidthPopup final : public WeldToolbarPopup { public: LineWidthPopup(weld::Widget* pParent, LinePropertyPanelBase& rParent); @@ -42,6 +43,8 @@ public: weld::Container* getTopLevel() const { return m_xTopLevel.get(); } + virtual void GrabFocus() override; + private: LinePropertyPanelBase& m_rParent; std::array<OUString, 9> maStrUnits; @@ -53,15 +56,12 @@ private: Image m_aIMGCus; Image m_aIMGCusGray; - std::unique_ptr<weld::Builder> m_xBuilder; - std::unique_ptr<weld::Container> m_xTopLevel; std::unique_ptr<weld::MetricSpinButton> m_xMFWidth; std::unique_ptr<LineWidthValueSet> m_xVSWidth; std::unique_ptr<weld::CustomWeld> m_xVSWidthWin; DECL_LINK(VSSelectHdl, ValueSet*, void); DECL_LINK(MFModifyHdl, weld::MetricSpinButton&, void); - DECL_LINK(FocusHdl, weld::Widget&, void); }; } // end of namespace svx::sidebar |