Git commit 7f3036e9c0939d9858d2092a681ba37b08f12bd8 by shivam makkar.
Committed on 12/03/2014 at 20:51.
Pushed by makkar into branch 'amourphious/porting5'.

scaleFactor refined

M  +16   -8    kcontrol/keyboard/preview/kbpreviewframe.cpp
M  +0    -1    kcontrol/keyboard/preview/keyboardpainter.cpp

http://commits.kde.org/kde-workspace/7f3036e9c0939d9858d2092a681ba37b08f12b=
d8

diff --git a/kcontrol/keyboard/preview/kbpreviewframe.cpp b/kcontrol/keyboa=
rd/preview/kbpreviewframe.cpp
index bb86e65..409cc2e 100644
--- a/kcontrol/keyboard/preview/kbpreviewframe.cpp
+++ b/kcontrol/keyboard/preview/kbpreviewframe.cpp
@@ -99,7 +99,8 @@ void KbPreviewFrame::drawKeySymbols(QPainter &painter, QP=
oint temp[], const GSha
                 QColor txtColor =3D txt[0] =3D=3D -1 ? unknownSymbolColor =
: color[level];
 =

                 painter.setPen(txtColor);
-                painter.drawText(temp[cordinate[level]].x()+xOffset[level]=
, temp[cordinate[level]].y()+yOffset[level], szx, szy, Qt::AlignTop, txt);
+
+                painter.drawText(temp[cordinate[level]].x()+xOffset[level]=
*scaleFactor/2.5, temp[cordinate[level]].y()+yOffset[level]*scaleFactor/2.5=
, szx, szy, Qt::AlignTop, txt);
 =

                 QString currentSymbol =3D key.getSymbol(keyLevel[l_id][lev=
el]);
                 currentSymbol =3D currentSymbol.size() < 3 ? currentSymbol=
.append("\t") : currentSymbol;
@@ -129,11 +130,12 @@ void KbPreviewFrame::drawKeySymbols(QPainter &painter=
, QPoint temp[], const GSha
         if( name.contains(fkKey) ){
             QString tempName =3D name;
             tempName.remove("K");
-            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*s.siz=
e(1)/2, tempName);
+            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*scale=
Factor*s.size(1)/5, tempName);
+        }
+        else{
+            painter.setFont(kbfont);
+            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*scale=
Factor*s.size(1)/5, name);
         }
-        else
-            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*s.siz=
e(1)/2, name);
-
         tip =3D name;
 =

         for(int i =3D 0 ; i < 4; i++){
@@ -331,12 +333,18 @@ void KbPreviewFrame::generateKeyboardLayout(const QSt=
ring& layout, const QString
 {
     geometry =3D grammar::parseGeometry(model);
     int endx =3D geometry.getWidth(), endy =3D geometry.getHeight();
-    int screenWidth =3D QApplication::desktop()->screenGeometry().width();
 =

-    scaleFactor =3D 2.5;
+    QDesktopWidget* desktopWidget =3D qApp->desktop();
+    QRect screenGeometry =3D desktopWidget->screenGeometry();
+    int screenWidth =3D screenGeometry.width();
+    //int screenHeight =3D screenGeometry.height();
+    //int screenWidth =3D QApplication::desktop()->screenGeometry().width(=
);
 =

-    while (scaleFactor*endx > screenWidth)
+    scaleFactor =3D 2.5;
+    qDebug()<<scaleFactor;
+    while (scaleFactor*endx + screenWidth/20 > screenWidth)
         scaleFactor -=3D 0.2;
+    qDebug()<<scaleFactor;
 =

     setFixedSize(scaleFactor*endx+60, scaleFactor*endy+60);
     qDebug()<<screenWidth<<":"<<scaleFactor<<scaleFactor*endx+60<<scaleFac=
tor*endy+60;
diff --git a/kcontrol/keyboard/preview/keyboardpainter.cpp b/kcontrol/keybo=
ard/preview/keyboardpainter.cpp
index 3a05d26..72ec874 100644
--- a/kcontrol/keyboard/preview/keyboardpainter.cpp
+++ b/kcontrol/keyboard/preview/keyboardpainter.cpp
@@ -25,7 +25,6 @@
 #include <QPushButton>
 #include <QComboBox>
 #include <QDebug>
-
 #include <KLocale>
 =

=20