diff options
| author | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-11-27 04:01:33 +0530 |
|---|---|---|
| committer | Akshay Deep <akshaydeepiitr@gmail.com> | 2016-11-30 10:29:10 +0000 |
| commit | 0046e3815406e99c8a5023c1046cbd8ac52a276b (patch) | |
| tree | 5ecf1efc854baa790434a0852c945e9d11f2d2c5 /sfx2 | |
| parent | c3d124254a3097163aae127e2fe3e34980417f20 (diff) | |
Emoji Control: Larger emoji rendering
Change-Id: Iec51d4e73926cf8203638d2ad013ddfdd47d8ee4
Reviewed-on: https://gerrit.libreoffice.org/31256
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 70c03ec408360bb1285478b08bd7edcdbb090376)
Reviewed-on: https://gerrit.libreoffice.org/31398
Reviewed-by: Akshay Deep <akshaydeepiitr@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/emojicontrol.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/emojiview.cxx | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index dc66b1fbecd7..f27f1027929e 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -85,6 +85,10 @@ SfxEmojiControl::SfxEmojiControl(sal_uInt16 nId, const css::uno::Reference< css: nCurPageId = mpTabControl->GetPageId(FILTER_UNICODE9); mpTabControl->SetTabPage(nCurPageId, pTabPage); ConvertLabelToUnicode(nCurPageId); + + vcl::Font rFont = mpTabControl->GetControlFont(); + rFont.SetFontHeight(TAB_FONT_SIZE); + mpTabControl->SetControlFont(rFont); pTabPage->Show(); mpEmojiView->SetStyle(mpEmojiView->GetStyle() | WB_VSCROLL); diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index 6ab877f9d4c2..6494002fa9ef 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -151,6 +151,13 @@ void EmojiView::Populate() } } +void EmojiView::ApplySettings(vcl::RenderContext& rRenderContext) +{ + ThumbnailView::ApplySettings(rRenderContext); + mpItemAttrs->aFontSize.setX(ITEM_MAX_WIDTH - 2*ITEM_PADDING); + mpItemAttrs->aFontSize.setY(ITEM_MAX_HEIGHT - 2*ITEM_PADDING); +} + void EmojiView::MouseButtonDown( const MouseEvent& rMEvt ) { GrabFocus(); |