fontMetrics().width -> fontMetrics().horizontalAdvance

3 files changed, 6 insertions, 6 deletions

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; i<txtL.length(); i++){
-	  if(( i+1<txtL.length()) && (button->fontMetrics().width(txtL[i]) < button->width()/2) ){
+	  if(( i+1<txtL.length()) && (button->fontMetrics().horizontalAdvance(txtL[i]) < button->width()/2) ){
 	    txtL[i] = txtL[i]+" "+txtL[i+1];
 	    txtL.removeAt(i+1);
 	  }
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/OutlineToolButton.h b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/OutlineToolButton.h
index 24410e75..0febe40f 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/OutlineToolButton.h
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/OutlineToolButton.h
@@ -76,13 +76,13 @@ protected:
 	      else{outC.setHsl(textC.hue(), textC.hslSaturation(), 255, 50); }
 	      //qDebug() << "Outline Color Values:" << outC;
 	    //Now get the size of the outline border (need to scale for high-res monitors)
-	    qreal OWidth = opt.fontMetrics.width("o")/2.0;
+	    qreal OWidth = opt.fontMetrics.horizontalAdvance("o")/2.0;
 	      //qDebug() << "Outline Width:" << OWidth;
 	    //Now generate a QPainterPath for the text
 	    QPainterPath path;
 	    QStringList txt = this->text().split("\n"); //need each line independently, the newline actually gets painted otherwise
 	    for(int i=0; i<txt.length(); i++){
-	      path.addText(box.center().x() - (opt.fontMetrics.width(txt[i])/2), box.y()+((i+1)*(box.height()/txt.length()))-opt.fontMetrics.descent(), opt.font, txt[i] );
+	      path.addText(box.center().x() - (opt.fontMetrics.horizontalAdvance(txt[i])/2), box.y()+((i+1)*(box.height()/txt.length()))-opt.fontMetrics.descent(), opt.font, txt[i] );
 	    }
 	    path.setFillRule(Qt::WindingFill);
 	    //Now paint the text 
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
index 90f3374b..6f4d62d6 100644
--- a/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
+++ b/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp
@@ -180,8 +180,8 @@ void DesktopViewPlugin::updateContents(){
     }
     //Now adjust the visible text as necessary based on font/grid sizing
     it->setToolTip(txt);
-    if(this->fontMetrics().width(txt) > (gridSZ.width()-4) ){
-      //int dash = this->fontMetrics().width("-");
+    if(this->fontMetrics().horizontalAdvance(txt) > (gridSZ.width()-4) ){
+      //int dash = this->fontMetrics().horizontalAdvance("-");
       //Text too long, try to show it on two lines
       txt = txt.section(" ",0,2).replace(" ","\n"); //First take care of any natural breaks
       if(txt.contains("\n")){