From b388b26bea6d661bd4c87edcbf29e2b480c684b4 Mon Sep 17 00:00:00 2001 From: Bora Hwang Date: Tue, 16 Apr 2013 20:46:11 +0900 Subject: [PATCH] [ctxpopup] P130404-1760: text should become ellipsis state when text is longer than width of ctxpopup Change-Id: I4022b0db4380b4b3cabb4b8cc7e39f38e3a54a3f Conflicts: themes/inc/tizen-hd-inc.edc --- themes/inc/tizen-hd-inc.edc | 8 ++++---- themes/widgets/ctxpopup.edc | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 3c289fb..30048c4 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -96,10 +96,10 @@ #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20 #define CTXPOPUP_WIDTH_MIN_INC 386 -#define CTXPOPUP_WIDTH_MAX_INC 700 -#define CTXPOPUP_TEXT_MAX_INC 660 -#define CTXPOPUP_ICON_TEXT_MAX_INC 603 -#define CTXPOPUP_MORE_TEXT_MAX_INC 603 +#define CTXPOPUP_WIDTH_MAX_INC 620 +#define CTXPOPUP_TEXT_MAX_INC 572 +#define CTXPOPUP_ICON_TEXT_MAX_INC 515 +#define CTXPOPUP_MORE_TEXT_MAX_INC 377 #define CTXPOPUP_BUBBLE_BG_IMAGE_BORDER 26 26 22 30 #define CTXPOPUP_BUBBLE_BG_PRESSED_IMAGE_BORDER 8 8 8 8 #define CTXPOPUP_SHADOW_LEFT_PADDING 10 diff --git a/themes/widgets/ctxpopup.edc b/themes/widgets/ctxpopup.edc index 65d5884..fae2c2d 100644 --- a/themes/widgets/ctxpopup.edc +++ b/themes/widgets/ctxpopup.edc @@ -2889,7 +2889,7 @@ group { image: "00_more_popup_press.png" COMP; } - data.item: "item_max_size" CTXPOPUP_TEXT_MAX_INC; + data.item: "item_max_size" CTXPOPUP_ICON_TEXT_MAX_INC; parts { part { @@ -3553,6 +3553,8 @@ group { image: "00_more_popup_press.png" COMP; } + data.item: "item_max_size" CTXPOPUP_MORE_TEXT_MAX_INC; + parts { part { name: "event_blocker"; -- 2.7.4