cui/uiconfig/ui/charnamepage.ui | 34 ++++++++
cui/uiconfig/ui/zoomdialog.ui | 11 +-
more_fonts/fonts/fc_local.conf | 1
vcl/inc/vcl/layout.hxx | 14 ---
vcl/source/window/builder.cxx | 6 +
vcl/source/window/layout.cxx | 168 ++++++++++++++++++++++++++++++----------
6 files changed, 181 insertions(+), 53 deletions(-)
New commits:
commit 71be8c531b332a0039096058bad6ab457d92c4b7
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 1 14:56:02 2013 +0000
chop custom target off a11y relation widget target name
Change-Id: I40a52bdca7884b092aa395d0afd0ffa5364f4ebc
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9786bfe..98091a3 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -184,7 +184,8 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir,
OUString sUIFile, OStri
{
const OString &rTarget = aP->second;
Window *pTarget = get<Window>(rTarget);
- SAL_WARN_IF(!pTarget, "vcl", "missing member of a11y relation");
+ SAL_WARN_IF(!pTarget, "vcl", "missing member of a11y relation: "
+ << rTarget.getStr());
if (!pTarget)
continue;
const OString &rType = aP->first;
@@ -1487,6 +1488,9 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader
&reader, stringmap &rM
{
span = reader.getAttributeValue(false);
sValue = OString(span.begin, span.length);
+ sal_Int32 nDelim = sValue.indexOf(':');
+ if (nDelim != -1)
+ sValue = sValue.copy(0, nDelim);
}
}
commit 7540afeb6e49e112c64dd71376953b0b810bcaed
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 1 14:47:29 2013 +0000
HIG: 12 pixels between label and labelee
+ indent hierarchy in 12 pixels
Change-Id: I9e2d8afc62c0bbd2726f743da8bcd6685b8cd431
diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui
index bb97815..5fe7cd7 100644
--- a/cui/uiconfig/ui/zoomdialog.ui
+++ b/cui/uiconfig/ui/zoomdialog.ui
@@ -76,6 +76,7 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame1">
@@ -87,12 +88,14 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="optimal">
<property name="label"
translatable="yes">Optimal</property>
@@ -165,7 +168,7 @@
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="variable">
<property name="label"
translatable="yes">Variable</property>
@@ -239,12 +242,14 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="automatic">
<property name="label"
translatable="yes">Automatic</property>
@@ -283,7 +288,7 @@
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">5</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="columns">
<property name="label"
translatable="yes">Columns</property>
@@ -332,7 +337,7 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">10</property>
+ <property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="bookmode">
<property name="label" translatable="yes">Book
mode</property>
commit d1f900bf55c3a04cce54c83a1814d8a81e77ff76
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 1 14:42:21 2013 +0000
set mnemonic widgets on char name page
Change-Id: I90d8bcdde05deb8b2af3b1b610bb444f944a1534
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 2df58c5..b2f4736 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -32,6 +32,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Family
</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">westfontnamelb-nocjk</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -47,6 +49,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Style</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">weststylelb-nocjk</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -62,6 +66,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Size</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">westsizelb-nocjk</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -78,6 +84,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Language</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">westlanglb-nocjk</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -226,6 +234,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Family
</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">westfontnamelb-cjk</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -241,6 +251,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Style</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">weststylelb-cjk</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -256,6 +268,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Size</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">westsizelb-cjk</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -271,6 +285,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Language</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">westlanglb-cjk</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -404,6 +420,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Family
</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eastfontnamelb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -419,6 +437,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Style</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eaststylelb</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -434,6 +454,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Size</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eastsizelb</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -449,6 +471,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Language</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">eastlanglb</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -582,6 +606,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Family
</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ctlfontnamelb</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -597,6 +623,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Style</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ctlstylelb</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -612,6 +640,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Size</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ctlsizelb</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -627,6 +657,8 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label"
translatable="yes">Language</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ctllanglb</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -760,6 +792,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Preview</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
commit 6e81082dbb2d16f0e61527c5ad13f91d49828125
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 1 07:24:16 2013 +0000
Resolves: fdo#59767 detect outlier widths and exclude from size
normalization
For non-homogeneous (the default) button boxes we want in general to give
all
buttons the same width as the max button width.
But if we detect that certain buttons are > 1.5 the average button width,
then
leave those outliers at their natural size and set the rest of the buttons
to
the max width of the remainder.
Change-Id: Ice514e741e3a7725d69e150e5752158a1c267141
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index b91534d..239e84c 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -204,9 +204,8 @@ class VCL_DLLPUBLIC VclButtonBox : public VclBox
{
public:
VclButtonBox(Window *pParent, int nSpacing)
- : VclBox(pParent, true, nSpacing)
+ : VclBox(pParent, false, nSpacing)
, m_eLayoutStyle(VCL_BUTTONBOX_DEFAULT_STYLE)
- , m_bHomogeneousGroups(false)
{
}
void set_layout(VclButtonBoxStyle eStyle)
@@ -221,20 +220,15 @@ public:
protected:
virtual Size calculateRequisition() const;
virtual void setAllocation(const Size &rAllocation);
+ Size addSpacing(const Size &rSize, sal_uInt16 nVisibleChildren) const;
private:
VclButtonBoxStyle m_eLayoutStyle;
- bool m_bHomogeneousGroups;
struct Requisition
{
- sal_uInt16 m_nMainGroupChildren;
- sal_uInt16 m_nSubGroupChildren;
+ std::vector<long> m_aMainGroupDimensions;
+ std::vector<long> m_aSubGroupDimensions;
Size m_aMainGroupSize;
Size m_aSubGroupSize;
- Requisition()
- : m_nMainGroupChildren(0)
- , m_nSubGroupChildren(0)
- {
- }
};
Requisition calculatePrimarySecondaryRequisitions() const;
Size addReqGroups(const VclButtonBox::Requisition &rReq) const;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 87c87d4..8f6893e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -333,17 +333,7 @@ Size VclButtonBox::addReqGroups(const
VclButtonBox::Requisition &rReq) const
long nMainGroupDimension = getPrimaryDimension(rReq.m_aMainGroupSize);
long nSubGroupDimension = getPrimaryDimension(rReq.m_aSubGroupSize);
- assert(m_bHomogeneous);
-
- if (m_bHomogeneousGroups)
- setPrimaryDimension(aRet, std::max(nMainGroupDimension,
nSubGroupDimension));
- else
- {
- setPrimaryDimension(aRet,
- (rReq.m_nMainGroupChildren * nMainGroupDimension
- + rReq.m_nSubGroupChildren * nSubGroupDimension) /
- (rReq.m_nMainGroupChildren + rReq.m_nSubGroupChildren));
- }
+ setPrimaryDimension(aRet, nMainGroupDimension + nSubGroupDimension);
setSecondaryDimension(aRet,
std::max(getSecondaryDimension(rReq.m_aMainGroupSize),
@@ -352,6 +342,40 @@ Size VclButtonBox::addReqGroups(const
VclButtonBox::Requisition &rReq) const
return aRet;
}
+static long getMaxNonOutlier(const std::vector<long> &rG, long nAvgDimension)
+{
+ long nMaxDimensionNonOutlier = 0;
+ for (std::vector<long>::const_iterator aI = rG.begin(),
+ aEnd = rG.end(); aI != aEnd; ++aI)
+ {
+ long nPrimaryChildDimension = *aI;
+ if (nPrimaryChildDimension <= nAvgDimension * 1.5)
+ {
+ nMaxDimensionNonOutlier = std::max(nPrimaryChildDimension,
+ nMaxDimensionNonOutlier);
+ }
+ }
+ return nMaxDimensionNonOutlier;
+}
+
+static std::vector<long> setButtonSizes(const std::vector<long> &rG,
+ long nAvgDimension, long nMaxNonOutlier)
+{
+ std::vector<long> aVec;
+ //set everything < 1.5 times the average to the same width, leave the
+ //outliers un-touched
+ for (std::vector<long>::const_iterator aI = rG.begin(), aEnd = rG.end();
+ aI != aEnd; ++aI)
+ {
+ long nPrimaryChildDimension = *aI;
+ if (nPrimaryChildDimension <= nAvgDimension * 1.5)
+ aVec.push_back(nMaxNonOutlier);
+ else
+ aVec.push_back(nPrimaryChildDimension);
+ }
+ return aVec;
+}
+
VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions() const
{
Requisition aReq;
@@ -359,8 +383,16 @@ VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions()
Size aMainGroupSize(DEFAULT_CHILD_MIN_WIDTH, DEFAULT_CHILD_MIN_HEIGHT);
//to-do, pull from theme
Size aSubGroupSize(DEFAULT_CHILD_MIN_WIDTH, DEFAULT_CHILD_MIN_HEIGHT);
//to-do, pull from theme
+ long nMinMainGroupPrimary = getPrimaryDimension(aMainGroupSize);
+ long nMinSubGroupPrimary = getPrimaryDimension(aSubGroupSize);
+ long nMainGroupSecondary = getSecondaryDimension(aMainGroupSize);
+ long nSubGroupSecondary = getSecondaryDimension(aSubGroupSize);
+
bool bIgnoreSecondaryPacking = (m_eLayoutStyle == VCL_BUTTONBOX_SPREAD ||
m_eLayoutStyle == VCL_BUTTONBOX_CENTER);
+ std::vector<long> aMainGroupSizes;
+ std::vector<long> aSubGroupSizes;
+
for (const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild =
pChild->GetWindow(WINDOW_NEXT))
{
if (!pChild->IsVisible())
@@ -368,29 +400,93 @@ VclButtonBox::Requisition
VclButtonBox::calculatePrimarySecondaryRequisitions()
Size aChildSize = getLayoutRequisition(*pChild);
if (bIgnoreSecondaryPacking || !pChild->get_secondary())
{
- ++aReq.m_nMainGroupChildren;
- accumulateMaxes(aChildSize, aMainGroupSize);
+ //set the max secondary dimension
+ nMainGroupSecondary = std::max(nMainGroupSecondary,
getSecondaryDimension(aChildSize));
+ //collect the primary dimensions
+ aMainGroupSizes.push_back(std::max(nMinMainGroupPrimary,
getPrimaryDimension(aChildSize)));
}
else
{
- ++aReq.m_nSubGroupChildren;
- accumulateMaxes(aChildSize, aSubGroupSize);
+ nSubGroupSecondary = std::max(nSubGroupSecondary,
getSecondaryDimension(aChildSize));
+ aSubGroupSizes.push_back(std::max(nMinSubGroupPrimary,
getPrimaryDimension(aChildSize)));
}
}
- if (aReq.m_nMainGroupChildren)
- aReq.m_aMainGroupSize = aMainGroupSize;
- if (aReq.m_nSubGroupChildren)
- aReq.m_aSubGroupSize = aSubGroupSize;
+ if (m_bHomogeneous)
+ {
+ long nMaxMainDimension = aMainGroupSizes.empty() ? 0 :
+ *std::max_element(aMainGroupSizes.begin(), aMainGroupSizes.end());
+ long nMaxSubDimension = aSubGroupSizes.empty() ? 0 :
+ *std::max_element(aSubGroupSizes.begin(), aSubGroupSizes.end());
+ long nMaxDimension = std::max(nMaxMainDimension, nMaxSubDimension);
+ aReq.m_aMainGroupDimensions.resize(aMainGroupSizes.size(),
nMaxDimension);
+ aReq.m_aSubGroupDimensions.resize(aSubGroupSizes.size(),
nMaxDimension);
+ }
+ else
+ {
+ //Ideally set everything to the same size, but find outlier widgets
+ //that are way wider than the average and leave them
+ //at their natural size and set the remainder to share the
+ //max size of the remaining members of the buttonbox
+ long nAccDimension = std::accumulate(aMainGroupSizes.begin(),
+ aMainGroupSizes.end(), 0);
+ nAccDimension = std::accumulate(aSubGroupSizes.begin(),
+ aSubGroupSizes.end(), nAccDimension);
+
+ long nAvgDimension = nAccDimension /
+ (aMainGroupSizes.size() + aSubGroupSizes.size());
+
+ long nMaxMainNonOutlier = getMaxNonOutlier(aMainGroupSizes,
+ nAvgDimension);
+ long nMaxSubNonOutlier = getMaxNonOutlier(aSubGroupSizes,
+ nAvgDimension);
+ long nMaxNonOutlier = std::max(nMaxMainNonOutlier, nMaxSubNonOutlier);
+
+ aReq.m_aMainGroupDimensions = setButtonSizes(aMainGroupSizes,
+ nAvgDimension, nMaxNonOutlier);
+ aReq.m_aSubGroupDimensions = setButtonSizes(aSubGroupSizes,
+ nAvgDimension, nMaxNonOutlier);
+ }
+
+ if (!aReq.m_aMainGroupDimensions.empty())
+ {
+ setSecondaryDimension(aReq.m_aMainGroupSize, nMainGroupSecondary);
+ setPrimaryDimension(aReq.m_aMainGroupSize,
+ std::accumulate(aReq.m_aMainGroupDimensions.begin(),
+ aReq.m_aMainGroupDimensions.end(), 0));
+ }
+ if (!aReq.m_aSubGroupDimensions.empty())
+ {
+ setSecondaryDimension(aReq.m_aSubGroupSize, nSubGroupSecondary);
+ setPrimaryDimension(aReq.m_aSubGroupSize,
+ std::accumulate(aReq.m_aSubGroupDimensions.begin(),
+ aReq.m_aSubGroupDimensions.end(), 0));
+ }
return aReq;
}
+Size VclButtonBox::addSpacing(const Size &rSize, sal_uInt16 nVisibleChildren)
const
+{
+ Size aRet;
+
+ if (nVisibleChildren)
+ {
+ long nPrimaryDimension = getPrimaryDimension(rSize);
+ setPrimaryDimension(aRet,
+ nPrimaryDimension + m_nSpacing * (nVisibleChildren-1));
+ setSecondaryDimension(aRet, getSecondaryDimension(rSize));
+ }
+
+ return aRet;
+}
+
Size VclButtonBox::calculateRequisition() const
{
Requisition aReq(calculatePrimarySecondaryRequisitions());
- sal_uInt16 nVisibleChildren = aReq.m_nMainGroupChildren +
aReq.m_nSubGroupChildren;
- return finalizeMaxes(addReqGroups(aReq), nVisibleChildren);
+ sal_uInt16 nVisibleChildren = aReq.m_aMainGroupDimensions.size() +
+ aReq.m_aSubGroupDimensions.size();
+ return addSpacing(addReqGroups(aReq), nVisibleChildren);
}
bool VclButtonBox::set_property(const rtl::OString &rKey, const rtl::OString
&rValue)
@@ -414,8 +510,6 @@ bool VclButtonBox::set_property(const rtl::OString &rKey,
const rtl::OString &rV
}
set_layout(eStyle);
}
- else if (rKey == "homogeneous")
- m_bHomogeneousGroups = toBool(rValue);
else
return VclBox::set_property(rKey, rValue);
return true;
@@ -425,17 +519,11 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
{
Requisition aReq(calculatePrimarySecondaryRequisitions());
- sal_uInt16 nVisibleChildren = aReq.m_nMainGroupChildren +
aReq.m_nSubGroupChildren;
- if (!nVisibleChildren)
+ if (aReq.m_aMainGroupDimensions.empty() &&
aReq.m_aSubGroupDimensions.empty())
return;
long nAllocPrimaryDimension = getPrimaryDimension(rAllocation);
- long nMainGroupPrimaryDimension =
getPrimaryDimension(aReq.m_aMainGroupSize);
- long nSubGroupPrimaryDimension = getPrimaryDimension(aReq.m_aSubGroupSize);
- if (m_bHomogeneousGroups)
- nSubGroupPrimaryDimension = nMainGroupPrimaryDimension =
std::max(nSubGroupPrimaryDimension, nMainGroupPrimaryDimension);
-
Point aMainGroupPos, aOtherGroupPos;
int nSpacing = m_nSpacing;
@@ -443,22 +531,22 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
switch (m_eLayoutStyle)
{
case VCL_BUTTONBOX_START:
- if (aReq.m_nSubGroupChildren)
+ if (!aReq.m_aSubGroupDimensions.empty())
{
long nOtherPrimaryDimension = getPrimaryDimension(
- finalizeMaxes(aReq.m_aSubGroupSize,
aReq.m_nSubGroupChildren));
+ addSpacing(aReq.m_aSubGroupSize,
aReq.m_aSubGroupDimensions.size()));
setPrimaryCoordinate(aOtherGroupPos,
nAllocPrimaryDimension - nOtherPrimaryDimension);
}
break;
case VCL_BUTTONBOX_SPREAD:
- if (aReq.m_nMainGroupChildren)
+ if (!aReq.m_aMainGroupDimensions.empty())
{
long nMainPrimaryDimension = getPrimaryDimension(
- finalizeMaxes(aReq.m_aMainGroupSize,
aReq.m_nMainGroupChildren));
+ addSpacing(aReq.m_aMainGroupSize,
aReq.m_aMainGroupDimensions.size()));
long nExtraSpace = nAllocPrimaryDimension -
nMainPrimaryDimension;
- nExtraSpace += (aReq.m_nMainGroupChildren-1) * nSpacing;
- nSpacing = nExtraSpace/(aReq.m_nMainGroupChildren+1);
+ nExtraSpace += (aReq.m_aMainGroupDimensions.size()-1) *
nSpacing;
+ nSpacing = nExtraSpace/(aReq.m_aMainGroupDimensions.size()+1);
setPrimaryCoordinate(aMainGroupPos, nSpacing);
}
break;
@@ -466,10 +554,10 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
SAL_WARN("vcl.layout", "todo unimplemented layout style");
case VCL_BUTTONBOX_DEFAULT_STYLE:
case VCL_BUTTONBOX_END:
- if (aReq.m_nMainGroupChildren)
+ if (!aReq.m_aMainGroupDimensions.empty())
{
long nMainPrimaryDimension = getPrimaryDimension(
- finalizeMaxes(aReq.m_aMainGroupSize,
aReq.m_nMainGroupChildren));
+ addSpacing(aReq.m_aMainGroupSize,
aReq.m_aMainGroupDimensions.size()));
setPrimaryCoordinate(aMainGroupPos,
nAllocPrimaryDimension - nMainPrimaryDimension);
}
@@ -479,6 +567,8 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
Size aChildSize;
setSecondaryDimension(aChildSize, getSecondaryDimension(rAllocation));
+ std::vector<long>::const_iterator aPrimaryI =
aReq.m_aMainGroupDimensions.begin();
+ std::vector<long>::const_iterator aSecondaryI =
aReq.m_aSubGroupDimensions.begin();
bool bIgnoreSecondaryPacking = (m_eLayoutStyle == VCL_BUTTONBOX_SPREAD ||
m_eLayoutStyle == VCL_BUTTONBOX_CENTER);
for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild =
pChild->GetWindow(WINDOW_NEXT))
{
@@ -487,6 +577,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
if (bIgnoreSecondaryPacking || !pChild->get_secondary())
{
+ long nMainGroupPrimaryDimension = *aPrimaryI++;
setPrimaryDimension(aChildSize, nMainGroupPrimaryDimension);
setLayoutAllocation(*pChild, aMainGroupPos, aChildSize);
long nPrimaryCoordinate = getPrimaryCoordinate(aMainGroupPos);
@@ -494,6 +585,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
}
else
{
+ long nSubGroupPrimaryDimension = *aSecondaryI++;
setPrimaryDimension(aChildSize, nSubGroupPrimaryDimension);
setLayoutAllocation(*pChild, aOtherGroupPos, aChildSize);
long nPrimaryCoordinate = getPrimaryCoordinate(aOtherGroupPos);
commit c28c3c55c4bf672aa9f8028deb9891ae49b625e1
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 1 06:09:00 2013 +0000
fontconfig: multiple <family> in <alias> isn't supported
Having multiple <family> in <alias> isn't supported and may not work as
expected
Change-Id: Ifffa81db6829e7e21ff061276e1558dda6b99c71
diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
index 973c7b5..c442c83 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/more_fonts/fonts/fc_local.conf
@@ -6,7 +6,6 @@
<alias binding="same">
<family>Liberation Sans Narrow</family>
- <family>Arial Narrow</family>
<default>
<family>Arial Narrow</family>
</default>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
