diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-27 21:29:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-27 21:30:37 +0100 |
| commit | b466bd9292de9755270b19153c41aed12e204761 (patch) | |
| tree | 0f0ad451f2891dd3db04be913be09906325981e4 /cui | |
| parent | b65c618f2d9c29838f5ed3cfe9cff4e34dea977e (diff) | |
Resolves: tdf#101475 adjacent cells text is still too wide
this still isn't brilliant I guess
Change-Id: I18b6647133329afa85826a8014f839986a9b68de
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/border.cxx | 10 | ||||
| -rw-r--r-- | cui/uiconfig/ui/borderpage.ui | 20 |
2 files changed, 17 insertions, 13 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index e66d30cd38e9..d061a480d908 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 29b810cf026e..c783d268396a 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> |