diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-12 11:40:27 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-31 15:40:29 +0000 |
| commit | b3abb55edd5f6c3168882239df2b4b28dc96cfab (patch) | |
| tree | a09e9378f1d95bb893561e6954760c3bcb1522fc /include | |
| parent | ff8a6b661dc304cb3a858facbd0dbda66ff01641 (diff) | |
Resolves: fdo#67378 merge the label into the disclosure button
(cherry picked from commit 479bba2cdcda8dbd86861ea62c8c25bfef633148)
(cherry picked from commit 06ac689a8d3887519d98a616f9a1727fcc7d0bf6)
(cherry picked from commit 5718ffbf0e3e68e43f87541ce0368a15de8ec90e)
Change-Id: I11c9a35e3d50a827127e4542a40f6f29580d4e8b
8b65b4986bf316e352131e737ebf736d91173d16
43df94c16a178c90da9c006565390a81c2fda29b
Related: fdo#67378 rows missing HIG 6pixel spacing
Change-Id: I6d4767c3159c1e9ebef19978a94ad994aab6ff4b
(cherry picked from commit c2ce9bf0c2bfd2b38262de8571257c8f02b076b4)
Reviewed-on: https://gerrit.libreoffice.org/5202
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/builder.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/layout.hxx | 17 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index d699d504278d..508377d46c98 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -31,6 +31,7 @@ class PopupMenu; class ScrollBar; class DateField; class TimeField; +class VclExpander; class VclMultiLineEdit; class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable @@ -209,6 +210,8 @@ private: AtkMap m_aAtkInfo; std::vector<MnemonicWidgetMap> m_aMnemonicWidgetMaps; + + std::vector<VclExpander*> m_aExpanderWidgets; }; void loadTranslations(const com::sun::star::lang::Locale &rLocale, const OUString &rUri); diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index dd2c0bc8d834..978eaca05ce4 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -517,6 +517,23 @@ public: virtual Window *get_child(); virtual const Window *get_child() const; virtual bool set_property(const OString &rKey, const OString &rValue); + bool get_expanded() const + { + return m_aDisclosureButton.IsChecked(); + } + void set_expanded(bool bExpanded) + { + m_aDisclosureButton.Check(bExpanded); + } + void set_label(const OUString& rLabel) + { + m_aDisclosureButton.SetText(rLabel); + } + OUString get_label() const + { + return m_aDisclosureButton.GetText(); + } + virtual void StateChanged(StateChangedType nType); protected: virtual Size calculateRequisition() const; virtual void setAllocation(const Size &rAllocation); |