projects
/
profile
/
mobile
/
apps
/
native
/
message.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a9ce365
7043dcc
)
Merge "TizenRefApp-5399 Implement more menu popup in conversation" into tizen
accepted/tizen/mobile/20160111.230500
submit/tizen/20160111.160230
author
Andrey Klimenko
<and.klimenko@samsung.com>
Mon, 11 Jan 2016 16:01:31 +0000
(08:01 -0800)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Mon, 11 Jan 2016 16:01:31 +0000
(08:01 -0800)
1
2
src/Conversation/Recipients/Controller/inc/RecipientsPanel.h
patch
|
diff1
|
diff2
|
blob
|
history
src/Conversation/Recipients/Controller/src/RecipientsPanel.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/Conversation/Recipients/View/inc/RecipientsPanelView.h
patch
|
diff1
|
diff2
|
blob
|
history
src/Conversation/Recipients/View/src/RecipientsPanelView.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/MsgThread/Controller/src/MsgThread.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Conversation/Recipients/Controller/inc/RecipientsPanel.h
Simple merge
diff --cc
src/Conversation/Recipients/Controller/src/RecipientsPanel.cpp
Simple merge
diff --cc
src/Conversation/Recipients/View/inc/RecipientsPanelView.h
index
90a4f3e
,
e763588
..
600484c
---
1
/
src/Conversation/Recipients/View/inc/RecipientsPanelView.h
---
2
/
src/Conversation/Recipients/View/inc/RecipientsPanelView.h
+++ b/
src/Conversation/Recipients/View/inc/RecipientsPanelView.h
@@@
-45,13
-45,9
+45,14
@@@
namespace Ms
bool getEntryFocus() const;
void setEntryFocus(bool val);
void clearEntry();
+ void clearMbe();
void setRecipientRect(Evas_Object *rect);
+ /**
+ * Gets a count of mbe items
+ */
+ unsigned int getMbeItemsCount() const;
+
private:
// Signals:
virtual void onItemAdded(RecipientViewItem &item) {};
diff --cc
src/Conversation/Recipients/View/src/RecipientsPanelView.cpp
Simple merge
diff --cc
src/MsgThread/Controller/src/MsgThread.cpp
Simple merge