summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAkshay Deep <akshaydeepiitr@gmail.com>2016-11-27 04:01:33 +0530
committerAkshay Deep <akshaydeepiitr@gmail.com>2016-11-30 10:29:10 +0000
commit0046e3815406e99c8a5023c1046cbd8ac52a276b (patch)
tree5ecf1efc854baa790434a0852c945e9d11f2d2c5 /include
parentc3d124254a3097163aae127e2fe3e34980417f20 (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 'include')
-rw-r--r--include/sfx2/emojicontrol.hxx2
-rw-r--r--include/sfx2/emojiview.hxx6
2 files changed, 6 insertions, 2 deletions
diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx
index 67835cd703d4..fe8a627c94bb 100644
--- a/include/sfx2/emojicontrol.hxx
+++ b/include/sfx2/emojicontrol.hxx
@@ -18,6 +18,8 @@
#include <sfx2/tbxctrl.hxx>
#include <com/sun/star/frame/XFrame.hpp>
+#define TAB_FONT_SIZE 15
+
class EmojiView;
class ThumbnailViewItem;
enum class FILTER_CATEGORY;
diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx
index 602fae9e9ec9..30245cfd195b 100644
--- a/include/sfx2/emojiview.hxx
+++ b/include/sfx2/emojiview.hxx
@@ -13,8 +13,8 @@
#include <sfx2/thumbnailview.hxx>
//unicode item defines
-#define ITEM_MAX_WIDTH 20
-#define ITEM_MAX_HEIGHT 20
+#define ITEM_MAX_WIDTH 30
+#define ITEM_MAX_HEIGHT 30
#define ITEM_PADDING 5
#define ITEM_MAX_TEXT_LENGTH 10
@@ -73,6 +73,8 @@ protected:
virtual void KeyInput( const KeyEvent& rKEvt ) override;
+ virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
+
protected:
std::string msJSONData;