diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-18 16:12:23 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2016-07-18 22:18:52 +0000 |
| commit | b2a3fd8037b6a50ed64c0a6a1dbd1d3e1f2f3575 (patch) | |
| tree | 31bb2c4611eafc803ce73ed902ca60bc921331db /cui | |
| parent | 7d50b617f1324d31c86a2f6667281ed56c74dc37 (diff) | |
Resolves: tdf#99963 line wrap very long checkbox content
Change-Id: I11ab52b8c6600d5d479ac3d4d2cd78d1957d8676
(cherry picked from commit ea3f74ba0a9d291f26a79f2568d59f1a030d0585)
Reviewed-on: https://gerrit.libreoffice.org/27292
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/border.cxx | 10 | ||||
| -rw-r--r-- | cui/uiconfig/ui/borderpage.ui | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index c999db8486c3..10e030249647 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -137,6 +137,16 @@ 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++) diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index d25dbedfd65b..20fe9418fd49 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -103,7 +103,7 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="rmadjcellborders"> + <object class="GtkCheckButton" id="rmadjcellborders:wrap"> <property name="label" translatable="yes">Remove border from adjacent cells as well</property> <property name="visible">True</property> <property name="can_focus">True</property> |