[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcachegrind/frameworks] libviews: Merge branch 'master' into frameworks
From:       Josef Weidendorfer <Josef.Weidendorfer () gmx ! de>
Date:       2016-10-24 20:51:44
Message-ID: E1bymDg-00016S-Pp () code ! kde ! org
[Download RAW message or body]

Git commit 84e3115bc666abcbbbe17e6c6260c7a7e732d45b by Josef Weidendorfer.
Committed on 24/10/2016 at 20:50.
Pushed by weidendo into branch 'frameworks'.

Merge branch 'master' into frameworks

M  +5    -11   libviews/callgraphview.cpp
M  +1    -2    libviews/instritem.cpp

http://commits.kde.org/kcachegrind/84e3115bc666abcbbbe17e6c6260c7a7e732d45b

diff --cc libviews/callgraphview.cpp
index 8c659ac,84e4251..34d37cf
--- a/libviews/callgraphview.cpp
+++ b/libviews/callgraphview.cpp
@@@ -1305,17 -1305,11 +1305,11 @@@ CanvasEdgeLabel::CanvasEdgeLabel(CallGr
  	_percentage = inclP;
  	if (_percentage > 100.0) _percentage = 100.0;
  
- 	if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) {
- 		QString icon = QStringLiteral("edit-undo");
- #if 0
- 		KIconLoader* loader = KIconLoader::global();
- 		QPixmap p= loader->loadIcon(icon, KIconLoader::Small, 0,
- 		                            KIconLoader::DefaultState, QStringList(), 0,
- 		                            true);
-         // Override percentage pixmap
- 		setPixmap(pixPos, p);
- #endif
- 	}
+     if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) {
+         QFontMetrics fm(font());
 -        QPixmap p = QIcon::fromTheme(QString("edit-undo")).pixmap(fm.height());
++        QPixmap p = QIcon::fromTheme(QStringLiteral("edit-undo")).pixmap(fm.height());
+         setPixmap(pixPos, p); // replace percentage pixmap
+     }
  }
  
  void CanvasEdgeLabel::paint(QPainter* p,
diff --cc libviews/instritem.cpp
index 167c9da,2fa043a..6f3146a
--- a/libviews/instritem.cpp
+++ b/libviews/instritem.cpp
@@@ -196,9 -196,8 +196,8 @@@ void InstrItem::updateCost(
      QString str;
      QPixmap p;
  
-     QFontMetrics fm(font(4));
+     QFontMetrics fm(font(1));
 -    p = QIcon::fromTheme(QString("edit-undo")).pixmap(fm.height());
 +    p = QIcon::fromTheme(QStringLiteral("edit-undo")).pixmap(fm.height());
- 
      if (p.isNull())
        str = QObject::tr("(cycle)");
  
[prev in list] [next in list] [prev in thread] [next in thread]