improved forwarded media display, 0.9.18

pkdevbox · Jan 5, 2016 · f2824f7 · f2824f7
1 parent 2c7fb82
commit f2824f7
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h
@@ -1323,17 +1323,14 @@ class HistoryPhoto : public HistoryFileMedia {
 		return _caption.original();
 	}
 	bool needsBubble(const HistoryItem *parent) const {
-		return !_caption.isEmpty() || parent->toHistoryReply() || parent->viaBot();
+		return !_caption.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot();
 	}
 	bool customInfoLayout() const {
 		return _caption.isEmpty();
 	}
 	bool hideFromName() const {
 		return true;
 	}
-	bool hideForwardedFrom() const {
-		return true;
-	}
 
 protected:
 
@@ -1392,17 +1389,14 @@ class HistoryVideo : public HistoryFileMedia {
 	ImagePtr replyPreview();
 
 	bool needsBubble(const HistoryItem *parent) const {
-		return !_caption.isEmpty() || parent->toHistoryReply() || parent->viaBot();
+		return !_caption.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot();
 	}
 	bool customInfoLayout() const {
 		return _caption.isEmpty();
 	}
 	bool hideFromName() const {
 		return true;
 	}
-	bool hideForwardedFrom() const {
-		return true;
-	}
 
 protected:
 
@@ -1628,17 +1622,14 @@ class HistoryGif : public HistoryFileMedia {
 		return _caption.original();
 	}
 	bool needsBubble(const HistoryItem *parent) const {
-		return !_caption.isEmpty() || parent->toHistoryReply() || parent->viaBot();
+		return !_caption.isEmpty() || parent->toHistoryForwarded() || parent->toHistoryReply() || parent->viaBot();
 	}
 	bool customInfoLayout() const {
 		return _caption.isEmpty();
 	}
 	bool hideFromName() const {
 		return true;
 	}
-	bool hideForwardedFrom() const {
-		return true;
-	}
 
 	~HistoryGif();
 
@@ -2165,7 +2156,7 @@ class HistoryForwarded : public HistoryMessage {
 	}
 	QString selectedText(uint32 selection) const;
 	bool displayForwardedFrom() const {
-		return via() || !_media || !_media->isDisplayed() || !_media->hideForwardedFrom();
+		return via() || !_media || !_media->isDisplayed() || (fwdFrom->isChannel() || !_media->hideForwardedFrom());
 	}
 
 	HistoryForwarded *toHistoryForwarded() {