diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index ae31412e6..ff4347fa4 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -524,71 +524,53 @@ border-image: url(:/images/btn_26_pressed.png) 4; - - - + + + true - - QFrame::StyledPanel + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - QFrame::Raised - - - - 0 + + + + 0 + 0 + 486 + 333 + - - 0 + + QWidget#scrollAreaWidgetContents{border: none;} - - - - true - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - 0 - 0 - 484 - 331 - + + + 0 + + + 0 + + + + + + + + Qt::Vertical - - QWidget#scrollAreaWidgetContents{border: none;} + + QSizePolicy::MinimumExpanding - - - 0 - - - 0 - - - - - - - - Qt::Vertical - - - - 391 - 266 - - - - - - - - - + + + 0 + 0 + + + + + + diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp index 3d90d605a..6156f239a 100644 --- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp +++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp @@ -163,7 +163,7 @@ void ChanMsgItem::updateItemStatic() } msgLabel->setText(QString::fromStdWString(cmi.msg)); - msgLabel->setVisible(!cmi.msg.empty()); + msgWidget->setVisible(!cmi.msg.empty()); QDateTime qtime; qtime.setTime_t(cmi.ts); diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui index ba03bf4e6..4744d6ccc 100644 --- a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui +++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui @@ -97,22 +97,6 @@ border-radius: 10px;} - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 138 - 1 - - - - @@ -457,28 +441,37 @@ border-radius: 10px;} - - - - 0 - 0 - - - - - PreferAntialias - - + - QLabel#msgLabel{border: 2px solid #238; + QWidget#msgWidget{border: 2px solid #238; border-radius: 10px;} - - - - - true - + + + 5 + + + + + + 0 + 0 + + + + + PreferAntialias + + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + +