summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-07-19 10:10:33 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-07-19 13:43:07 +0200
commit5e5e49eba37c15b17a4d9788da91415abbca4eb1 (patch)
tree9bd41777ec12581c94eae53e5a12295f012dc848 /cui
parent843a1dbbdbedaa58d5d24768b6a718aa9fb4a053 (diff)
tdf#117038 set button width to max possible content width
Change-Id: I97e7c27523d213cb06cdf87a8ed0124d1ea8d5ba Reviewed-on: https://gerrit.libreoffice.org/57718 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'cui')
-rwxr-xr-xcui/source/dialogs/cuicharmap.cxx10
1 files changed, 9 insertions, 1 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 678bddee71e3..d65ec3fe1926 100755
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -493,6 +493,14 @@ void SvxCharacterMap::init()
m_xHexCodeText->connect_changed( LINK( this, SvxCharacterMap, HexCodeChangeHdl ) );
m_xFavouritesBtn->connect_clicked( LINK(this, SvxCharacterMap, FavSelectHdl));
+ // tdf#117038 set the buttons width to its max possible width so it doesn't
+ // make layout change when the label changes
+ m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_REMOVE_FAVORITES));
+ auto nMaxWidth = m_xFavouritesBtn->get_preferred_size().Width();
+ m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_ADD_FAVORITES));
+ nMaxWidth = std::max(nMaxWidth, m_xFavouritesBtn->get_preferred_size().Width());
+ m_xFavouritesBtn->set_size_request(nMaxWidth, -1);
+
if( SvxShowCharSet::getSelectedChar() == ' ')
{
m_xOKBtn->set_sensitive(false);
@@ -560,7 +568,7 @@ void SvxCharacterMap::setFavButtonState(const OUString& sTitle, const OUString&
else
m_xFavouritesBtn->set_sensitive(true);
- if(isFavChar(sTitle, rFont))
+ if (isFavChar(sTitle, rFont))
{
m_xFavouritesBtn->set_label(CuiResId(RID_SVXSTR_REMOVE_FAVORITES));
}