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

List:       kde-commits
Subject:    playground/edu/kanagram/src
From:       Joshua Keel <joshuakeel () gmail ! com>
Date:       2005-07-29 13:10:57
Message-ID: 1122642657.712388.5068.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439982 by jkeel:

Increase the size of the menu rectangles to include the whole filing cabinet box


 M  +7 -23     kanagram.cpp  
 M  +2 -2      kanagram.h  


--- trunk/playground/edu/kanagram/src/kanagram.cpp #439981:439982
@@ -50,7 +50,7 @@
 #include "newstuff.h"
 
 
-Kanagram::Kanagram() : QWidget(0, 0, WStaticContents | WNoAutoErase), \
m_overNext(false), m_overConfig(false), m_overHelp(false), m_overQuit(false), \
m_overReveal(false), m_overHint(false), m_overTry(false), m_showHint(false), \
m_overHelpBox(false) +Kanagram::Kanagram() : QWidget(0, 0, WStaticContents | \
WNoAutoErase), m_overNext(false), m_overConfig(false), m_overHelp(false), \
m_overQuit(false), m_overReveal(false), m_overHint(false), m_overTry(false), \
m_showHint(false)  {
 	m_back = new QPixmap(locate("appdata", "images/kanagram.png"));
 	m_aboutKDEOverlay = new QPixmap(locate("appdata", "images/kicon.png"));
@@ -77,12 +77,10 @@
 	m_quitRect = QRect(453, 352, 182, 104);
 	*/
 
-	m_nextRect = QRect(525, 38, 39, 39);
-	m_configRect = QRect(525, 130, 39, 39);
-	m_helpRect = QRect(525, 218, 39, 39);
-	m_quitRect = QRect(520, 362, 39, 39);
-
-	m_helpBoxRect = QRect(477, 212, 134, 76);
+	m_nextRect = QRect(477, 31, 134, 76);
+	m_configRect = QRect(477, 122, 134, 76);
+	m_helpRect = QRect(477, 212, 134, 76);
+	m_quitRect = QRect(453, 352, 182, 104);
 	
 	m_hintRect = QRect(51, 337, 39, 28);
 	m_revealRect = QRect(279, 338, 119, 28);
@@ -224,7 +222,7 @@
 		p.drawText(446, 207, 171, 85, WordBreak | AlignCenter, m_game.getHint());
 	}
 
-	if(m_overHelpBox)
+	if(m_overHelp)
 	{
 		p.drawPixmap(456, 275, *m_card);
 		if(m_overAboutApp)
@@ -359,7 +357,7 @@
 		}
 	}
 
-	if(m_overHelpBox)
+	if(m_overHelp)
 	{
 		if(m_handbookRect.contains(e->pos()))
 		{
@@ -542,20 +540,6 @@
 		haveToUpdate = true;
 	}
 
-	if(m_helpBoxRect.contains(p))
-	{
-		if(!m_overHelpBox)
-		{
-			m_overHelpBox = true;
-			haveToUpdate = true;
-		}
-	}
-	else if(m_overHelpBox)
-	{
-		m_overHelpBox = false;
-		haveToUpdate = true;
-	}
-
 	if (haveToUpdate) update();
 }
 
--- trunk/playground/edu/kanagram/src/kanagram.h #439981:439982
@@ -75,9 +75,9 @@
 		//Deprecated
 		//QRect m_newWordRect, m_settingsRect, m_helpRect, m_quitRect;
 		
-		QRect m_nextRect, m_configRect, m_helpRect, m_quitRect, m_revealRect, m_hintRect, \
m_tryRect, m_aboutKDERect, m_aboutAppRect, m_handbookRect, m_switcherRect, \
m_arrowRect, m_logoRect, m_helpBoxRect; +		QRect m_nextRect, m_configRect, \
m_helpRect, m_quitRect, m_revealRect, m_hintRect, m_tryRect, m_aboutKDERect, \
m_aboutAppRect, m_handbookRect, m_switcherRect, m_arrowRect, m_logoRect;  
-		bool m_overNext, m_overConfig, m_overHelp, m_overQuit, m_overReveal, m_overHint, \
m_overTry, m_overAboutKDE, m_overAboutApp, m_overHandbook, m_overSwitcher, \
m_overHelpBox; +		bool m_overNext, m_overConfig, m_overHelp, m_overQuit, \
m_overReveal, m_overHint, m_overTry, m_overAboutKDE, m_overAboutApp, m_overHandbook, \
m_overSwitcher;  
 		bool m_showHint;
 


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