[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/amourphious/porting5] kcontrol/keyboard/preview: scaleFactor refined
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2014-03-12 20:52:04
Message-ID: E1WNq8C-0003cE-9T () scm ! kde ! org
[Download RAW message or body]

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/7f3036e9c0939d9858d2092a681ba37b08f12bd8

diff --git a/kcontrol/keyboard/preview/kbpreviewframe.cpp b/kcontrol/keyboard/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, QPoint temp[], const GSha
                 QColor txtColor = txt[0] == -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 = key.getSymbol(keyLevel[l_id][level]);
                 currentSymbol = 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 = name;
             tempName.remove("K");
-            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*s.size(1)/2, tempName);
+            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*scaleFactor*s.size(1)/5, tempName);
+        }
+        else{
+            painter.setFont(kbfont);
+            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*scaleFactor*s.size(1)/5, name);
         }
-        else
-            painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*s.size(1)/2, name);
-
         tip = name;
 
         for(int i = 0 ; i < 4; i++){
@@ -331,12 +333,18 @@ void KbPreviewFrame::generateKeyboardLayout(const QString& layout, const QString
 {
     geometry = grammar::parseGeometry(model);
     int endx = geometry.getWidth(), endy = geometry.getHeight();
-    int screenWidth = QApplication::desktop()->screenGeometry().width();
 
-    scaleFactor = 2.5;
+    QDesktopWidget* desktopWidget = qApp->desktop();
+    QRect screenGeometry = desktopWidget->screenGeometry();
+    int screenWidth = screenGeometry.width();
+    //int screenHeight = screenGeometry.height();
+    //int screenWidth = QApplication::desktop()->screenGeometry().width();
 
-    while (scaleFactor*endx > screenWidth)
+    scaleFactor = 2.5;
+    qDebug()<<scaleFactor;
+    while (scaleFactor*endx + screenWidth/20 > screenWidth)
         scaleFactor -= 0.2;
+    qDebug()<<scaleFactor;
 
     setFixedSize(scaleFactor*endx+60, scaleFactor*endy+60);
     qDebug()<<screenWidth<<":"<<scaleFactor<<scaleFactor*endx+60<<scaleFactor*endy+60;
diff --git a/kcontrol/keyboard/preview/keyboardpainter.cpp \
b/kcontrol/keyboard/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>
 
 


[prev in list] [next in list] [prev in thread] [next in thread]