FIX(ui): resolve text/icon scaling issues

Fixed chat log scaling issue introduced by PR mumble-voip#5619 (my fault, whoops)
The bug fixed by that commit is still fixed after this PR, but the
regression introduced has been resolved.

Added minimum icon size for channel status icons which now scale since PR mumble-voip#5772
Initially, icons were too small at 100% scale.

Author: dexgs

src/mumble/Log.cpp

@@ -679,7 +679,9 @@ QString Log::validHtml(const QString &html, QTextCursor *tc) {
 	}
 
 	if (tc) {
-		tc->insertHtml(qtd.toHtml());
+		QTextCursor tcNew(&qtd);
+		tcNew.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
+		tc->insertFragment(tcNew.selection());
 		return QString();
 	} else {
 		return qtd.toHtml();
@@ -710,6 +712,11 @@ void Log::log(MsgType mt, const QString &console, const QString &terse, bool own
 		// the setting might change in that time).
 		const int msgMargin = Global::get().s.iChatMessageMargins;
 
+		QTextFrameFormat qttf;
+		qttf.setTopMargin(msgMargin);
+		qttf.setBottomMargin(0);
+		qttf.setPosition(QTextFrameFormat::FloatLeft);
+
 		LogTextBrowser *tlog     = Global::get().mw->qteLog;
 		const int oldscrollvalue = tlog->getLogScroll();
 		const bool scroll        = (oldscrollvalue == tlog->getLogScrollMaximum());
@@ -728,13 +735,6 @@ void Log::log(MsgType mt, const QString &console, const QString &terse, bool own
 		QString fixedNLPlain =
 			plain.replace(QLatin1String("\r\n"), QLatin1String("\n")).replace(QLatin1String("\r"), QLatin1String("\n"));
 
-		QTextFrameFormat qttf;
-		// `insertFrame` causes a blank line to precede the inserted frame.
-		// This is remedied by setting a negative top margin of equal height.
-		static int lineSpacing = QFontMetrics(tc.currentFrame()->format().toCharFormat().font()).lineSpacing();
-		qttf.setTopMargin(-lineSpacing);
-		qttf.setBottomMargin(msgMargin);
-
 		if (fixedNLPlain.contains(QRegExp(QLatin1String("\\n[ \\t]*$")))) {
 			// If the message ends with one or more blank lines (or lines only containing whitespace)
 			// paint a border around the message to make clear that it contains invisible parts.
@@ -743,10 +743,11 @@ void Log::log(MsgType mt, const QString &console, const QString &terse, bool own
 			qttf.setBorder(1);
 			qttf.setPadding(2);
 			qttf.setBorderStyle(QTextFrameFormat::BorderStyle_Dashed);
+			tc.insertFrame(qttf);
+		} else if (!tc.atStart()) {
+			tc.insertFrame(qttf);
 		}
 
-		tc.insertFrame(qttf);
-
 		const QString timeString =
 			dt.time().toString(QLatin1String(Global::get().s.bLog24HourClock ? "HH:mm:ss" : "hh:mm:ss AP"));
 		tc.insertHtml(Log::msgColor(QString::fromLatin1("[%1] ").arg(timeString.toHtmlEscaped()), Log::Time));

src/mumble/UserView.cpp

@@ -111,9 +111,9 @@ UserView::UserView(QWidget *p) : QTreeView(p) {
 	// Calculate the icon size for status icons based on font size
 	// This should automaticially adjust size when the user has
 	// display scaling enabled
-	m_flagTotalDimension  = QFontMetrics(p->font()).height();
+	m_flagTotalDimension  = std::max(18, QFontMetrics(p->font()).height());
 	int flagIconPadding   = 1;
-	int flagIconDimension = m_flagTotalDimension - (4 * flagIconPadding);
+	int flagIconDimension = m_flagTotalDimension - (2 * flagIconPadding);
 	setItemDelegate(new UserDelegate(this, m_flagTotalDimension, flagIconPadding, flagIconDimension));
 
 	connect(this, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(nodeActivated(const QModelIndex &)));