cui/source/tabpages/border.cxx | 10 ---------- cui/uiconfig/ui/borderpage.ui | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 13 deletions(-)
New commits: commit b466bd9292de9755270b19153c41aed12e204761 Author: Caolán McNamara <[email protected]> Date: Tue Sep 27 21:29:18 2016 +0100 Resolves: tdf#101475 adjacent cells text is still too wide this still isn't brilliant I guess Change-Id: I18b6647133329afa85826a8014f839986a9b68de diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index e66d30c..d061a48 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -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++) diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index 29b810c..c783d26 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -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>
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
