summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-04-30 15:56:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-04-30 16:00:17 +0100
commit930582f5bcb3dc2e9a05d5ec38cdc11f35b92cc3 (patch)
treec18849e3585e2e1ade7ec645cb51a49af2560e1e /svx
parentbf3f3668c8962936bc7d4d5f19427f711bf90677 (diff)
rework background page to balance the preview and controls
a) expand to fit the available space b) make the controls and the preview the same size c) reorganize the three options of color, gradient and bitmap to all put the preview in the same place and adjust so the preview is the same size in each case, i.e. switching between views gives the impression of a single shared preview element d) put a border around the gradient list so its area is visually noticable to be the same size as its preview area Change-Id: I88735778bb482f9dd011f890d170be127877367a
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/dlgctrl.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 671083f7a231..29d6b9b407f1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1102,9 +1102,13 @@ GradientLB::GradientLB( Window* pParent, WinBits nWinStyle, sal_Bool bUserDraw /
EnableUserDraw( mbUserDraw);
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent, VclBuilder::stringmap &rMap)
{
- GradientLB *pListBox = new GradientLB(pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE);
+ WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+ OString sBorder = VclBuilder::extractCustomProperty(rMap);
+ if (!sBorder.isEmpty())
+ nWinStyle |= WB_BORDER;
+ GradientLB *pListBox = new GradientLB(pParent, nWinStyle);
pListBox->EnableAutoSize(true);
return pListBox;
}