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

List:       kde-commits
Subject:    KDE/kdegames/kolf
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2010-10-31 22:15:25
Message-ID: 20101031221525.DF470AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1191680 by majewsky:

Remove resizing code in Slope, kill uses of CanvasItem::firstMove() method.

 M  +0 -2      canvasitem.h  
 M  +0 -3      game.cpp  
 M  +3 -24     slope.cpp  
 M  +0 -7      slope.h  


--- trunk/KDE/kdegames/kolf/canvasitem.h #1191679:1191680
@@ -44,8 +44,6 @@
 	virtual bool loadLast() const { return false; }
 	///called if the item is made by user while editing, with the item that was \
selected on the hole;  virtual void selectedItem(QGraphicsItem * /*item*/) {}
-	///called after the item is moved the very first time by the game
-	virtual void firstMove(int /*x*/, int /*y*/) {}
 	///save your settings.
 	virtual void save(KConfigGroup *cfg);
 	///save a point if you wish. Rarely necessary.
--- trunk/KDE/kdegames/kolf/game.cpp #1191679:1191680
@@ -3868,8 +3868,6 @@
 				addItemToFastAdvancersList(sceneItem);
 
 			newItem->setPos(x, y); 
-
-			sceneItem->firstMove(x, y);
 			newItem->setVisible(true);
 
 			// make things actually show
@@ -4042,7 +4040,6 @@
 		addItemToFastAdvancersList(sceneItem);
 
 	newItem->setPos(width/2 - 18, height / 2 - 18);
-	sceneItem->firstMove(width/2 - 18, height/2 - 18); //do I need this?
 	sceneItem->moveBy(0, 0);
 	sceneItem->setSize(newItem->boundingRect().width(), \
newItem->boundingRect().height());  
--- trunk/KDE/kdegames/kolf/slope.cpp #1191679:1191680
@@ -35,7 +35,6 @@
 	setData(0, 1031);
 	stuckOnGround = false;
 	showingInfo = false;
-	baseArrowPenThickness = arrowPenThickness = 1;
 
 	gradientKeys[Vertical] = "Vertical";
 	gradientKeys[Horizontal] = "Horizontal";
@@ -54,8 +53,7 @@
 	point = new RectPoint(color.light(), this, parent);
 
 	QFont font(QApplication::font());
-	baseFontPixelSize = 18;
-	font.setPixelSize(baseFontPixelSize);
+	font.setPixelSize(18);
 	text = new QGraphicsSimpleTextItem(Kolf::findBoard(this));
 	text->setZValue(99999.99);
 	text->setFont(font);
@@ -95,23 +93,6 @@
 	text->setVisible(false);
 }
 
-void Slope::resize(double resizeFactor)
-{
-	this->resizeFactor = resizeFactor;
-	QFont font = text->font();
-	font.setPixelSize((int)(baseFontPixelSize*resizeFactor));
-	text->setFont(font);
-	arrowPenThickness = baseArrowPenThickness*resizeFactor;
-	setPos(baseX*resizeFactor, baseY*resizeFactor);
-// 	setRect(0, 0, baseWidth*resizeFactor, baseHeight*resizeFactor);
-}
-
-void Slope::firstMove(int x, int y)
-{
-	baseX = (double)x;
-	baseY = (double)y;
-}
-
 void Slope::aboutToDie()
 {
 	delete point;
@@ -262,8 +243,6 @@
 
 	// bypass updatePixmap which newSize normally does
 	Tagaro::SpriteObjectItem::setSize(QSizeF(cfgGroup->readEntry("width", width()), \
                cfgGroup->readEntry("height", height())));
-	baseWidth = size().width();
-	baseHeight = size().height();
 	updateZ();
 
 	QString gradientType = cfgGroup->readEntry("gradient", gradientKeys[type]);
@@ -459,7 +438,7 @@
 			Arrow *arrow = new Arrow(Kolf::findBoard(this));
 			arrow->setLength(length);
 			arrow->setAngle(angle);
-			arrow->setPen(QPen(Qt::black, arrowPenThickness));
+			arrow->setPen(QPen(Qt::black));
 			arrow->setReversed(reversed);
 			arrow->updateSelf();
 			arrows.append(arrow);
@@ -492,7 +471,7 @@
 
 		arrow->setAngle(angle);
 		arrow->setLength(length);
-		arrow->setPen(QPen(Qt::black, arrowPenThickness));
+		arrow->setPen(QPen(Qt::black));
 		arrow->updateSelf();
 
 		arrows.append(arrow);
--- trunk/KDE/kdegames/kolf/slope.h #1191679:1191680
@@ -50,8 +50,6 @@
 
 	virtual void showInfo();
 	virtual void hideInfo();
-	void resize(double resizeFactor);
-	void firstMove(int x, int y);
 	virtual void editModeChanged(bool changed);
 	virtual bool canBeMovedByOthers() const { return !stuckOnGround; }
 	virtual QList<QGraphicsItem *> moveableItems() const;
@@ -99,11 +97,6 @@
 	QColor color;
 	void updatePixmap();
 	bool stuckOnGround;
-	//base numbers are the size or position when no resizing has taken place (i.e. the \
                defaults)
-	double baseX, baseY, baseWidth, baseHeight;
-	double baseArrowPenThickness, arrowPenThickness;
-	int baseFontPixelSize;
-	double resizeFactor;
 
 	void clearArrows();
 


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