summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorHeiko Tietze <tietze.heiko@gmail.com>2021-05-07 12:19:19 +0200
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2021-05-11 16:10:45 +0200
commit8fa4371664108560dda438be8fc997d9cfe4bb6e (patch)
tree8b49c531f9b6302f3f8deee78bcb33cf555fafb6 /svx
parent83d91ebbbda2204af9a09a921055a850a16911e0 (diff)
Resolves tdf#127406 - Font name and style name not readable
Font name dropdown made 5 chars larger, style name +3 Change-Id: Ia37af6742cf7b754b25b9af18d7b29858634e5a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115234 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fbac6172a92e..f72141d85214 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -866,7 +866,7 @@ SvxStyleBox_Base::SvxStyleBox_Base(std::unique_ptr<weld::ComboBox> xWidget,
m_xWidget->connect_custom_render(LINK(this, SvxStyleBox_Base, CustomRenderHdl));
m_xWidget->set_custom_renderer(true);
- m_xWidget->set_entry_width_chars(COMBO_WIDTH_IN_CHARS);
+ m_xWidget->set_entry_width_chars(COMBO_WIDTH_IN_CHARS + 3);
}
IMPL_LINK(SvxStyleBox_Base, CustomGetSizeHdl, OutputDevice&, rArg, Size)
@@ -1106,7 +1106,7 @@ void SvxStyleBox_Impl::SetOptimalSize()
// set width in chars low so the size request will not be overridden
m_xWidget->set_entry_width_chars(1);
// tdf#132338 purely using this calculation to keep things their traditional width
- Size aSize(LogicToPixel(Size(COMBO_WIDTH_IN_CHARS * 4, 0), MapMode(MapUnit::MapAppFont)));
+ Size aSize(LogicToPixel(Size((COMBO_WIDTH_IN_CHARS + 3) * 4, 0), MapMode(MapUnit::MapAppFont)));
m_xWidget->set_size_request(aSize.Width(), -1);
SetSizePixel(get_preferred_size());
@@ -1479,7 +1479,7 @@ SvxFontNameBox_Base::SvxFontNameBox_Base(std::unique_ptr<weld::ComboBox> xWidget
m_xWidget->connect_focus_out(LINK(this, SvxFontNameBox_Base, FocusOutHdl));
m_xWidget->connect_get_property_tree(LINK(this, SvxFontNameBox_Base, DumpAsPropertyTreeHdl));
- m_xWidget->set_entry_width_chars(COMBO_WIDTH_IN_CHARS);
+ m_xWidget->set_entry_width_chars(COMBO_WIDTH_IN_CHARS + 5);
}
SvxFontNameBox_Impl::SvxFontNameBox_Impl(vcl::Window* pParent, const Reference<XDispatchProvider>& rDispatchProvider,
@@ -1614,7 +1614,7 @@ void SvxFontNameBox_Impl::SetOptimalSize()
// set width in chars low so the size request will not be overridden
m_xWidget->set_entry_width_chars(1);
// tdf#132338 purely using this calculation to keep things their traditional width
- Size aSize(LogicToPixel(Size(COMBO_WIDTH_IN_CHARS * 4, 0), MapMode(MapUnit::MapAppFont)));
+ Size aSize(LogicToPixel(Size((COMBO_WIDTH_IN_CHARS +5) * 4, 0), MapMode(MapUnit::MapAppFont)));
m_xWidget->set_size_request(aSize.Width(), -1);
SetSizePixel(get_preferred_size());