From 7e07c3980607d8c6e394520ea2e5ea37cb8860b7 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Tue, 22 Oct 2019 21:07:16 +0200 Subject: fontMetrics().width -> fontMetrics().horizontalAdvance --- .../lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp') diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp index 88f535de..f954ec4f 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -168,7 +168,7 @@ void AppLauncherPlugin::loadButton(){ //Now adjust the visible text as necessary based on font/grid sizing if(button->toolTip().isEmpty()){ button->setToolTip(txt); } //Double check that the visual icon size matches the requested size - otherwise upscale the icon - if(button->fontMetrics().width(txt) > (button->width()-OUTMARGIN) ){ + if(button->fontMetrics().horizontalAdvance(txt) > (button->width()-OUTMARGIN) ){ //Text too long, try to show it on two lines //txt = button->fontMetrics().elidedText(txt, Qt::ElideRight, 2*(button->width()-OUTMARGIN), Qt::TextWordWrap); txt =txt.section(" ",0,2).replace(" ","\n"); //First take care of any natural breaks @@ -177,7 +177,7 @@ void AppLauncherPlugin::loadButton(){ //need to check each line QStringList txtL = txt.split("\n"); for(int i=0; ifontMetrics().width(txtL[i]) < button->width()/2) ){ + if(( i+1fontMetrics().horizontalAdvance(txtL[i]) < button->width()/2) ){ txtL[i] = txtL[i]+" "+txtL[i+1]; txtL.removeAt(i+1); } -- cgit