mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#101475 adjacent cells text is still too wide

Browse Source 
this still isn't brilliant I guess

Change-Id: I18b6647133329afa85826a8014f839986a9b68de
This commit is contained in:
Caolán McNamara
2016-09-27 21:29:18 +01:00
parent b65c618f2d
commit b466bd9292
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cui/source/tabpages/border.cxx
View File

@@ -137,16 +137,6 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
get(m_pMergeAdjacentBordersCB, "mergeadjacent");
get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders");
//tdf#99963, we need height-for-width support here, but for now we can
//bodge it
Size aPrefSize(m_pRemoveAdjcentCellBordersCB->get_preferred_size());
Size aSize(m_pRemoveAdjcentCellBordersCB->CalcMinimumSize(36*approximate_char_width()));
if (aPrefSize.Width() > aSize.Width())
{
m_pRemoveAdjcentCellBordersCB->set_width_request(aSize.Width());
m_pRemoveAdjcentCellBordersCB->set_height_request(aSize.Height());
}
if ( GetDPIScaleFactor() > 1 )
{
for (short i = 0; i < aBorderImgLst.GetImageCount(); i++)

20
cui/uiconfig/ui/borderpage.ui
View File

@@ -103,8 +103,22 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="rmadjcellborders:wrap">
<property name="label" translatable="yes">Remove border from adjacent cells</property>
<object class="GtkLabel" id="rmadjcellbordersft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Adjacent Cells:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rmadjcellborders</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="rmadjcellborders">
<property name="label" translatable="yes">Remove border</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -113,7 +127,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="top_attach">5</property>
</packing>
</child>
</object>