SVN commit 950132 by ruberg: Enhanced scaling. Plasmaboard is now freely scalable M +1 -0 BoardKey.cpp M +4 -52 widget.cpp --- trunk/playground/base/plasma/applets/plasmaboard/BoardKey.cpp #950131:950132 @@ -29,6 +29,7 @@ //this->setDrawBackground(true); setMaximumSize(1000,1000); setMinimumSize(10,10); + setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored, QSizePolicy::DefaultType); } BoardKey::~BoardKey() { --- trunk/playground/base/plasma/applets/plasmaboard/widget.cpp #950131:950132 @@ -148,13 +148,15 @@ for(int i = 0; isetColumnPreferredWidth(i,width/numberOfCols); - } + }/* for(int i = 0; isetRowPreferredHeight(i,height/numberOfRows); layout->setRowMaximumHeight(i,100); - } + }*/ layout->setSpacing(0); + layout->setContentsMargins(0,0,0,0); + setLayout(layout); } @@ -252,56 +254,6 @@ p->setRenderHint(QPainter::SmoothPixmapTransform); p->setRenderHint(QPainter::Antialiasing); - /* - int heightUnit = (contentsRect().height() / 5); - float widthUnit = (contentsRect().width())/ 31; - - // top row - int i = 0; - int x = 0; - while( i < 13) { - alphaKeys[i]->setGeometry(QRectF(x*widthUnit, 0, 2*widthUnit, heightUnit)); - i++; x+=2; - } - funcKeys[0]->setGeometry(QRectF(x*widthUnit, 0, widthUnit*5, heightUnit)); // Backspace - - // second Row - funcKeys[1]->setGeometry(QRectF(0, heightUnit, widthUnit*3, heightUnit)); //tab - x = 3; - while( i < 25) { - alphaKeys[i]->setGeometry(QRectF(x*widthUnit, heightUnit, 2*widthUnit, heightUnit)); - i++; x+=2; - } - funcKeys[2]->setGeometry(QRectF((x+1)*widthUnit, heightUnit, widthUnit*3, 2*heightUnit)); // return - - // third row - funcKeys[3]->setGeometry(QRectF(0, 2*heightUnit, widthUnit*4, heightUnit)); // Caps - x = 4; - while( i < 37) { - alphaKeys[i]->setGeometry(QRectF(x*widthUnit, 2*heightUnit, 2*widthUnit, heightUnit)); - i++; x+=2; - } - - // fourth row - funcKeys[4]->setGeometry(QRectF(0, 3*heightUnit, widthUnit*3, heightUnit)); // left shift - x = 3; - while( i < 48) { - alphaKeys[i]->setGeometry(QRectF(x*widthUnit, 3*heightUnit, 2*widthUnit, heightUnit)); - i++; x+=2; - } - funcKeys[5]->setGeometry(QRectF(x*widthUnit, 3*heightUnit, widthUnit*6, heightUnit)); // right shift - - // fifth row - funcKeys[6]->setGeometry(QRectF(0, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[7]->setGeometry(QRectF(2*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[8]->setGeometry(QRectF(4*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[9]->setGeometry(QRectF(6*widthUnit, 4*heightUnit, 14*widthUnit, heightUnit)); // space - funcKeys[10]->setGeometry(QRectF(20*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[11]->setGeometry(QRectF(22*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[12]->setGeometry(QRectF(24*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[13]->setGeometry(QRectF(26*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - funcKeys[14]->setGeometry(QRectF(28*widthUnit, 4*heightUnit, 2*widthUnit, heightUnit)); - */ p->restore(); }