@@ -300,32 +300,31 @@ DccObject {
300300 Layout .maximumWidth : parent .width - 100
301301
302302 Label {
303- height: 20
304303 text: dccObj .displayName
305304 font: DTK .fontManager .t6
306305 horizontalAlignment: Qt .AlignLeft
307306 verticalAlignment: Qt .AlignVCenter
308307 leftPadding: 15
308+ bottomPadding: 4
309309 }
310310
311311 Row {
312312 spacing: 0
313- width: Math . min ( parent .width , descriptionTextMetrics . width + changePasswordLabel . implicitWidth + 15 )
313+ width: parent .width
314314 clip: true
315315
316316 Label {
317317 id: descriptionLabel
318- height: 20
319318 text: dccObj .description
320319 font: DTK .fontManager .t10
321320 horizontalAlignment: Qt .AlignLeft
322321 verticalAlignment: Qt .AlignVCenter
323322 leftPadding: 15
324323 opacity: 0.5
325324 elide: Text .ElideRight
326- width: changePasswordLabel .visible ?
327- Math . max ( 0 , Math . min ( descriptionTextMetrics . width + 15 , parent .parent . width - changePasswordLabel .implicitWidth - 30 )) :
328- Math . max ( 0 , Math . min ( descriptionTextMetrics . width + 15 , parent . parent . width ))
325+ width: Math . min (implicitWidth, changePasswordLabel .visible ?
326+ ( parent .width - changePasswordLabel .implicitWidth - 15 ) :
327+ ( parent . width - 15 ))
329328
330329 TextMetrics {
331330 id: descriptionTextMetrics
@@ -335,7 +334,7 @@ DccObject {
335334
336335 ToolTip {
337336 text: dccObj .description
338- visible: descriptionMouseArea .containsMouse && descriptionTextMetrics . width > ( descriptionLabel .width - 15 )
337+ visible: descriptionMouseArea .containsMouse && descriptionLabel . implicitWidth > descriptionLabel .width
339338 }
340339
341340 MouseArea {
@@ -347,7 +346,6 @@ DccObject {
347346
348347 Label {
349348 id: changePasswordLabel
350- height: 20
351349 text: " <a href=\" Change Password\" >" + qsTr (" Change Password" ) + " </a>"
352350 visible: dccData .mode ().grubEditAuthEnabled
353351 horizontalAlignment: Qt .AlignLeft
@@ -361,6 +359,12 @@ DccObject {
361359 passwordDlg .show ()
362360 }
363361 }
362+
363+ Item {
364+ id: item
365+ width: Math .max (0 , parent .width - descriptionLabel .width -
366+ (changePasswordLabel .visible ? changePasswordLabel .implicitWidth : 0 ))
367+ }
364368 }
365369 }
366370
0 commit comments