summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Tietze <heiko.tietze@documentfoundation.org>2019-09-09 18:13:10 +0200
committerHeiko Tietze <heiko.tietze@documentfoundation.org>2019-09-09 18:13:31 +0200
commit856565e99d9f3245d1ccb0563eeed6cdfd557afc (patch)
tree54bcd8569ccf38158337c750017019b3c3167bb0
parentb613ca105b080bb275d6f687b6b443b10b27c284 (diff)
Revert "tdf#127066 Font size of Calc input bar aligned to UI font size"
Mistakenly picked for 6.3.2, it should have been 6.3. This reverts commit b613ca105b080bb275d6f687b6b443b10b27c284. Change-Id: I17f061ed9871a264a1c6ed32178ab61d094876db Reviewed-on: https://gerrit.libreoffice.org/78783 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
-rw-r--r--sc/source/ui/app/inputwin.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 216a5bd6477e..e206a3506669 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -74,6 +74,7 @@ namespace com::sun::star::accessibility { class XAccessible; }
const long THESIZE = 1000000; // Should be more than enough!
const long INPUTLINE_INSET_MARGIN = 2; // Space between border and interior widgets of input line
+const long MIN_FONT_SIZE = 16; // Minimum font size of input line in pixels
const long LEFT_OFFSET = 5; // Left offset of input line
const long BUTTON_OFFSET = 2; // Space between input line and button to expand/collapse
const long MULTILINE_BUTTON_WIDTH = 20; // Width of the button which opens multiline dropdown
@@ -1433,6 +1434,8 @@ ScTextWnd::ScTextWnd(ScTextWndGroup* pParent, ScTabViewShell* pViewSh)
vcl::Font aAppFont = GetFont();
aTextFont = aAppFont;
Size aFontSize = aAppFont.GetFontSize();
+ if (aFontSize.Height() < MIN_FONT_SIZE)
+ aFontSize.setHeight(MIN_FONT_SIZE);
aTextFont.SetFontSize(PixelToLogic(aFontSize, MapMode(MapUnit::MapTwip)));
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();