Merge pull request #2022 from defnax/small-fixes-channels

[Channels] Fixed to get work selection color on dark stylesheets
This commit is contained in:
csoler 2020-06-25 16:47:17 +02:00 committed by GitHub
commit 05d311e55c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

View File

@ -36,6 +36,8 @@
class ChannelPostThumbnailView: public QWidget class ChannelPostThumbnailView: public QWidget
{ {
Q_OBJECT
public: public:
// This variable determines the zoom factor on the text below thumbnails. 2.0 is mostly correct for all screen. // This variable determines the zoom factor on the text below thumbnails. 2.0 is mostly correct for all screen.
static constexpr float THUMBNAIL_OVERSAMPLE_FACTOR = 2.0; static constexpr float THUMBNAIL_OVERSAMPLE_FACTOR = 2.0;

View File

@ -705,15 +705,15 @@ void GxsChannelPostsWidgetWithModel::groupNameChanged(const QString &name)
QIcon GxsChannelPostsWidgetWithModel::groupIcon() QIcon GxsChannelPostsWidgetWithModel::groupIcon()
{ {
// if (mStateHelper->isLoading(mTokenTypeGroupData) || mStateHelper->isLoading(mTokenTypeAllPosts)) { /* CHANNEL IMAGE */
// return QIcon(":/images/kalarm.png"); QPixmap chanImage;
// } if (mGroup.mImage.mData != NULL) {
GxsIdDetails::loadPixmapFromData(mGroup.mImage.mData, mGroup.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
} else {
chanImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
}
// if (mNewCount) { return QIcon(chanImage);
// return QIcon(":/images/message-state-new.png");
// }
return QIcon();
} }
/*************************************************************************************/ /*************************************************************************************/