From fae1c0dbdd2ad66e532ef9e6c58d8f77b1c68947 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 15 Nov 2018 10:23:07 +0100
Subject: ShareUserLine: fix eliding

The widget doesn't have its final size at construction time, so the
width for eliding is not yet known. Let ElidedLabel do the job.
---
 src/gui/shareusergroupwidget.cpp |  6 ++----
 src/gui/shareuserline.ui         | 11 +++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index bd8565434..c428bd440 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -371,10 +371,8 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
 {
     _ui->setupUi(this);
 
-    QString sharedWithText(share->getShareWith()->format());
-    QFontMetrics metrics(_ui->sharedWith->font());
-    QString elidedText = metrics.elidedText(sharedWithText, Qt::ElideRight, _ui->sharedWith->width());
-    _ui->sharedWith->setText(elidedText);
+    _ui->sharedWith->setElideMode(Qt::ElideRight);
+    _ui->sharedWith->setText(share->getShareWith()->format());
 
     // adds permissions
     // can edit permission
diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui
index 4cab56839..4632f162f 100644
--- a/src/gui/shareuserline.ui
+++ b/src/gui/shareuserline.ui
@@ -97,9 +97,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="sharedWith">
+    <widget class="OCC::ElidedLabel" name="sharedWith">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+      <sizepolicy hsizetype="Ignored" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -204,6 +204,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>OCC::ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>elidedlabel.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../../client.qrc"/>
  </resources>
-- 
cgit v1.2.3