From 2e1a68b1aee4d6679ecfa85fd82a070ddd2732bc Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Tue, 16 Feb 2010 11:34:56 +0100
Subject: [PATCH] QmlDesigner.Navigator: Long text in items' names is elided
---
.../components/navigator/navigatortreeview.cpp | 13 ++-----------
.../components/navigator/navigatorview.cpp | 2 +-
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
index 2e688f23a8e..c319a4176cb 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
@@ -160,17 +160,8 @@ void IdItemDelegate::paint(QPainter *painter,
// Check text length does not exceed available space
int extraSpace=12+pixmap.width();
- QFontMetrics metric(painter->fontMetrics());
- if (painter->fontMetrics().boundingRect(myString).width() > option.rect.width()-extraSpace)
- {
- QString origString(myString);
- int cutpoint=origString.length()/2;
- while (painter->fontMetrics().boundingRect(myString).width() > option.rect.width()-extraSpace)
- {
- cutpoint--;
- myString = origString.left(cutpoint)+QLatin1String("...")+origString.right(cutpoint);
- }
- }
+ QFontMetrics fm(option.font);
+ myString = fm.elidedText(myString,Qt::ElideMiddle,option.rect.width()-extraSpace);
painter->drawText(option.rect.bottomLeft()+QPoint(3+pixmap.width(),-8),myString);
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index b0bfabccfa6..2d5e56676b3 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -90,7 +90,7 @@ void NavigatorView::modelAttached(Model *model)
treeWidget()->header()->setResizeMode(0, QHeaderView::Stretch);
treeWidget()->header()->resizeSection(1,26);
treeWidget()->setRootIsDecorated(false);
- treeWidget()->setIndentation(40);
+ treeWidget()->setIndentation(20);
#ifdef _LOCK_ITEMS_
treeWidget()->header()->resizeSection(2,20);
#endif
--
GitLab