Merge pull request #2925 from talentraspel/19706

separate style handling for chat area and its context menu.
This commit is contained in:
Brad Hefta-Gaub 2014-05-27 09:31:24 -07:00
commit cac2db4a8a

View file

@ -306,7 +306,7 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
messageArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); messageArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
messageArea->setReadOnly(true); messageArea->setReadOnly(true);
messageArea->setStyleSheet("padding-bottom: 2px;" messageArea->setStyleSheet("QTextBrowser{ padding-bottom: 2px;"
"padding-left: 2px;" "padding-left: 2px;"
"padding-top: 2px;" "padding-top: 2px;"
"padding-right: 20px;" "padding-right: 20px;"
@ -314,7 +314,8 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
"color: #333333;" "color: #333333;"
"font-size: 14pt;" "font-size: 14pt;"
"background-color: rgba(0, 0, 0, 0%);" "background-color: rgba(0, 0, 0, 0%);"
"border: 0;"); "border: 0; }"
"QMenu{ border: 2px outset gray; }");
QString userLabel = getParticipantName(message.from()); QString userLabel = getParticipantName(message.from());
if (fromSelf) { if (fromSelf) {