summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2016-08-30 15:39:51 +0400
committerMaxim Monastirsky <momonasmon@gmail.com>2016-09-03 20:06:28 +0000
commitca504cd4ca381e5d24a82e588dac51c344c6f946 (patch)
tree9416637e3f5e32ae50d2a6dc752e3ae0e7d4c3a5
parente65b42831bca279d67748eaacb119e844d3d6964 (diff)
tdf#94551 Preset list: 3 entries per row and always show scrollbar
Change-Id: I748b92d01031120e750f306549c7d46ed29a313a Reviewed-on: https://gerrit.libreoffice.org/28492 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
-rw-r--r--svx/source/tbxctrls/SvxPresetListBox.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index 0786d9d9049b..55278124f70d 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -30,9 +30,9 @@
SvxPresetListBox::SvxPresetListBox(vcl::Window* pParent, WinBits nWinStyle)
: ValueSet(pParent, nWinStyle),
- nColCount(2),
+ nColCount(3),
nRowCount(5),
- aIconSize( Size(80,60) )
+ aIconSize( Size(60,64) )
{
SetEdgeBlending(true);
SetExtraSpacing(4);
@@ -53,10 +53,7 @@ void SvxPresetListBox::Resize()
{
DrawLayout();
WinBits aWinBits(GetStyle());
- if( nColCount*nRowCount < static_cast<sal_uInt16>(GetItemCount()) )
- aWinBits |= WB_VSCROLL;
- else
- aWinBits &= ~WB_VSCROLL;
+ aWinBits |= WB_VSCROLL;
SetStyle(aWinBits);
ValueSet::Resize();
}