diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-22 15:38:05 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:18 +0100 |
| commit | 60285fdc868635f99644ef1d8a195a2be87074c7 (patch) | |
| tree | dbd69b9d424b527357c2ba33c2256e99edca3d91 /include/vcl/lstbox.hxx | |
| parent | 3af7ae5ef74756b33d35a67b7a6cee44acf79737 (diff) | |
Related: #i122041# More unifications for FillStyles
better defaults and better preview visualizations
(cherry picked from commit 35c9acfc98fc98399005815e0464b1944f327d4e)
Conflicts:
officecfg/registry/schema/org/openoffice/Office/Common.xcs
svtools/inc/svtools/accessibilityoptions.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/config/accessibilityoptions.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/valueset.cxx
svtools/source/inc/configitems/accessibilityoptions_const.hxx
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/xtable.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/tbxctrls/SvxColorValueSet.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtable.cxx
vcl/inc/ilstbox.hxx
vcl/inc/vcl/combobox.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/settings.hxx
vcl/source/app/settings.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/lstbox.cxx
Change-Id: I905b6814cb796a35aa23fedb9ce716f77e2bfda0
Diffstat (limited to 'include/vcl/lstbox.hxx')
| -rw-r--r-- | include/vcl/lstbox.hxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index b66223328cbe..61f8b24b5f0d 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -41,13 +41,16 @@ private: ImplListBoxFloatingWindow* mpFloatWin; ImplWin* mpImplWin; ImplBtn* mpBtn; - sal_uInt16 mnDDHeight; - sal_uInt16 mnSaveValue; - sal_Bool mbDDAutoSize; + sal_uInt16 mnDDHeight; + sal_uInt16 mnSaveValue; sal_Int32 m_nMaxWidthChars; Link maSelectHdl; Link maDoubleClickHdl; - sal_uInt16 mnLineCount; + sal_uInt16 mnLineCount; + + /// bitfield + bool mbDDAutoSize : 1; + bool mbEdgeBlending : 1; private: SAL_DLLPRIVATE void ImplInitListBoxData(); @@ -102,11 +105,12 @@ public: Rectangle GetDropDownPosSizePixel() const; + void AdaptDropDownLineCountToMaximum(); void SetDropDownLineCount( sal_uInt16 nLines ); sal_uInt16 GetDropDownLineCount() const; - void EnableAutoSize( sal_Bool bAuto ); - sal_Bool IsAutoSizeEnabled() const { return mbDDAutoSize; } + void EnableAutoSize( bool bAuto ); + bool IsAutoSizeEnabled() const { return mbDDAutoSize; } void EnableDDAutoWidth( sal_Bool b ); @@ -199,6 +203,9 @@ public: void EnableMirroring(); + bool GetEdgeBlending() const { return mbEdgeBlending; } + void SetEdgeBlending(bool bNew); + /** checks whether a certain point lies within the bounds of a listbox item and returns the item as well as the character position the point is at. |