change size event and pos event

huairen · huairen · commit 26eb1c7f25e5 · 2014-04-03T14:35:37.000+08:00
diff --git a/src/base/JuiControl.cpp b/src/base/JuiControl.cpp
@@ -103,30 +103,30 @@ void JuiControl::SetBackground(const std::string& drawable)
 void JuiControl::SetPosition(const JPoint2I& point)
 {
 	m_rcBounds.position = point;
-	if(m_pLayoutParam != NULL)
-		m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);
+	if(m_pLayoutParam != NULL && m_pParent != NULL)
+		m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);
 }
 
 void JuiControl::SetPosition( int x, int y )
 {
 	m_rcBounds.position.x = x;
 	m_rcBounds.position.y = y;
-	if(m_pLayoutParam != NULL)
-		m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);
+	if(m_pLayoutParam != NULL && m_pParent != NULL)
+		m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);
 }
 
 void JuiControl::SetPosX(int x)
 {
 	m_rcBounds.position.x = x;
-	if(m_pLayoutParam != NULL)
-		m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);
+	if(m_pLayoutParam != NULL && m_pParent != NULL)
+		m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);
 }
 
 void JuiControl::SetPosY(int y)
 {
 	m_rcBounds.position.y = y;
-	if(m_pLayoutParam != NULL)
-		m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);
+	if(m_pLayoutParam != NULL && m_pParent != NULL)
+		m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);
 }
 
 bool JuiControl::IsPointIn( const JPoint2I& pt )
diff --git a/src/base/JuiControl.h b/src/base/JuiControl.h
@@ -131,7 +131,7 @@ class JuiControl : public JObject
 
 	virtual void OnKeyDown() {}
 
-	virtual void OnSizeChanged(const JPoint2I& newSize) {}
+	virtual void OnSizeChanged() {}
 	virtual void OnRender(JPoint2I offset, const JRectI& rcPaint);
 	// @ }
 
diff --git a/src/base/JuiControl.inl b/src/base/JuiControl.inl
@@ -40,56 +40,50 @@ inline JuiLayoutParameter * JuiControl::GetLayoutParameter()
 //---------------------------------------------------------------------------
 inline void JuiControl::SetBounds(const JPoint2I& position, const JPoint2I& extent)
 {
-	if(m_rcBounds.extent != extent)
-	{
-		OnSizeChanged(m_rcBounds.extent);
-		m_rcBounds.extent = extent;
-	}
-	m_rcBounds.position = position;
+	SetPosition(position);
+	SetExtent(extent);
 }
 
 inline void JuiControl::SetBounds( const JRectI& bounds )
 {
-	if(m_rcBounds.extent != bounds.extent)
-		OnSizeChanged(m_rcBounds.extent);
-
-	m_rcBounds = bounds;
+	SetPosition(bounds.position);
+	SetExtent(bounds.extent);
 }
 
 inline void JuiControl::SetExtent(const JPoint2I& size)
 {
 	if(m_rcBounds.extent != size)
 	{
-		OnSizeChanged(size);
 		m_rcBounds.extent = size;
+		OnSizeChanged();
 	}
 }
 
 inline void JuiControl::SetExtent( int width, int height )
 {
 	if(m_rcBounds.extent.x != width == m_rcBounds.extent.y != height)
 	{
-		OnSizeChanged(JPoint2I(width,height));
 		m_rcBounds.extent.x = width;
 		m_rcBounds.extent.y = height;
+		OnSizeChanged();
 	}
 }
 
 inline void JuiControl::SetWidth(int width)
 {
 	if(m_rcBounds.extent.x != width)
 	{
-		OnSizeChanged(JPoint2I(width,m_rcBounds.extent.y));
 		m_rcBounds.extent.x = width;
+		OnSizeChanged();
 	}
 }
 
 inline void JuiControl::SetHeight(int height)
 {
 	if(m_rcBounds.extent.y != height)
 	{
-		OnSizeChanged(JPoint2I(m_rcBounds.extent.x,height));
 		m_rcBounds.extent.y = height;
+		OnSizeChanged();
 	}
 }
 
diff --git a/src/base/JuiReader.cpp b/src/base/JuiReader.cpp
@@ -80,7 +80,7 @@ bool JuiReader::LoadScript( JuiContainer *root, const char* filename )
 			{
 				JuiContainer *container = dynamic_cast<JuiContainer*>(currObject);
 				if(container != NULL)
-					container->OnSizeChanged(container->GetExtent());
+					container->OnSizeChanged();
 			}
 
 			if(stackIndex >= 0)
diff --git a/src/base/win32/JuiFrame.cpp b/src/base/win32/JuiFrame.cpp
@@ -37,10 +37,10 @@ JuiEventManager * JuiFrame::GetInputGenerator()
 }
 
 
-void JuiFrame::OnSizeChanged(const JPoint2I& newSize)
+void JuiFrame::OnSizeChanged()
 {
-	Parent::OnSizeChanged(newSize);
-	JuiWindow::SetSize(newSize.x,newSize.y);
+	Parent::OnSizeChanged();
+	JuiWindow::SetSize(GetWidth(),GetHeight());
 }
 
 bool JuiFrame::HandleHitTest( POINTS pt, LRESULT* result )
diff --git a/src/base/win32/JuiFrame.h b/src/base/win32/JuiFrame.h
@@ -16,7 +16,7 @@ class JuiFrame : public JuiFrameLayout, public JuiWindow
 
 	virtual void AddUpdateRegion( const JPoint2I& pos, const JPoint2I& extent );
 	virtual JuiEventManager *GetInputGenerator();
-	virtual void OnSizeChanged(const JPoint2I& newSize);
+	virtual void OnSizeChanged();
 
 protected:
 	virtual bool HandleHitTest(POINTS pt, LRESULT* result);
diff --git a/src/layout/JuiFrameLayout.cpp b/src/layout/JuiFrameLayout.cpp
@@ -71,12 +71,8 @@ void JuiFrameLayoutParameter::UpdateControl( JuiControl *pCtrl, const JPoint2I &
 	pCtrl->SetPosition(m_ptOrigPos);
 }
 
-void JuiFrameLayoutParameter::UpdatePos(JuiContainer* pParent, JRectI& bound)
+void JuiFrameLayoutParameter::UpdatePos(const JPoint2I &parentSize, JRectI& bound)
 {
-	if(pParent == NULL)
-		return;
-
-	JPoint2I parentSize = pParent->GetExtent();
 	m_ptOrigPos = bound.position;
 
 	if(m_Gravity == GRAVITY_RIGHT)
@@ -98,15 +94,15 @@ JuiFrameLayoutParameter* JuiFrameLayout::CreateParameter()
 	return new JuiFrameLayoutParameter;
 }
 
-void JuiFrameLayout::OnSizeChanged(const JPoint2I& newSize)
+void JuiFrameLayout::OnSizeChanged()
 {
 	JuiControl* pCtrl = (JuiControl*)m_lsChilds.First();
 	while(pCtrl)
 	{
 		JuiFrameLayoutParameter *pParam = static_cast<JuiFrameLayoutParameter*>(pCtrl->GetLayoutParameter());
 		if(pParam != NULL)
 		{
-			pParam->UpdateControl(pCtrl, newSize);
+			pParam->UpdateControl(pCtrl, GetExtent());
 		}
 
 		pCtrl = (JuiControl*)m_lsChilds.Next();
diff --git a/src/layout/JuiFrameLayout.h b/src/layout/JuiFrameLayout.h
@@ -39,7 +39,7 @@ class JuiFrameLayoutParameter : public JuiLayoutParameter
 
 	void UpdateControl(JuiControl *pCtrl, const JPoint2I &parentSize);
 
-	virtual void UpdatePos(JuiContainer* pParent, JRectI& bound);
+	virtual void UpdatePos(const JPoint2I &parentSize, JRectI& bound);
 
 private:
 	LayoutSizeType m_LayoutWidth;
@@ -54,7 +54,7 @@ class JuiFrameLayout : public JuiContainer
 	JDECLARE_DYNAMIC_CLASS(JuiRelativeLayout)
 public:
 	virtual JuiFrameLayoutParameter* CreateParameter();
-	virtual void OnSizeChanged(const JPoint2I& newSize);
+	virtual void OnSizeChanged();
 	virtual void OnChildAdded(JuiControl *child);
 	virtual void OnChildRemoved(JuiControl *child);
 };
diff --git a/src/layout/JuiLayoutParameter.h b/src/layout/JuiLayoutParameter.h
@@ -8,7 +8,7 @@ class JuiLayoutParameter : public JObject
 {
 	JDECLARE_ABSTRACT_CLASS(JuiLayoutParameter)
 public:
-	virtual void UpdatePos(JuiContainer* pParent, JRectI& bound) = 0;
+	virtual void UpdatePos(const JPoint2I &parentSize, JRectI& bound) = 0;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -103,30 +103,30 @@ void JuiControl::SetBackground(const std::string& drawable)`
`103`	`103`	`void JuiControl::SetPosition(const JPoint2I& point)`
`104`	`104`	`{`
`105`	`105`	`m_rcBounds.position = point;`
`106`		`- if(m_pLayoutParam != NULL)`
`107`		`- m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);`
	`106`	`+ if(m_pLayoutParam != NULL && m_pParent != NULL)`
	`107`	`+ m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`void JuiControl::SetPosition( int x, int y )`
`111`	`111`	`{`
`112`	`112`	`m_rcBounds.position.x = x;`
`113`	`113`	`m_rcBounds.position.y = y;`
`114`		`- if(m_pLayoutParam != NULL)`
`115`		`- m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);`
	`114`	`+ if(m_pLayoutParam != NULL && m_pParent != NULL)`
	`115`	`+ m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`void JuiControl::SetPosX(int x)`
`119`	`119`	`{`
`120`	`120`	`m_rcBounds.position.x = x;`
`121`		`- if(m_pLayoutParam != NULL)`
`122`		`- m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);`
	`121`	`+ if(m_pLayoutParam != NULL && m_pParent != NULL)`
	`122`	`+ m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`void JuiControl::SetPosY(int y)`
`126`	`126`	`{`
`127`	`127`	`m_rcBounds.position.y = y;`
`128`		`- if(m_pLayoutParam != NULL)`
`129`		`- m_pLayoutParam->UpdatePos(m_pParent, m_rcBounds);`
	`128`	`+ if(m_pLayoutParam != NULL && m_pParent != NULL)`
	`129`	`+ m_pLayoutParam->UpdatePos(m_pParent->GetExtent(), m_rcBounds);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`bool JuiControl::IsPointIn( const JPoint2I& pt )`
Original file line number	Diff line number	Diff line change
`@@ -40,56 +40,50 @@ inline JuiLayoutParameter * JuiControl::GetLayoutParameter()`
`40`	`40`	`//---------------------------------------------------------------------------`
`41`	`41`	`inline void JuiControl::SetBounds(const JPoint2I& position, const JPoint2I& extent)`
`42`	`42`	`{`
`43`		`- if(m_rcBounds.extent != extent)`
`44`		`- {`
`45`		`- OnSizeChanged(m_rcBounds.extent);`
`46`		`- m_rcBounds.extent = extent;`
`47`		`- }`
`48`		`- m_rcBounds.position = position;`
	`43`	`+ SetPosition(position);`
	`44`	`+ SetExtent(extent);`
`49`	`45`	`}`
`50`	`46`
`51`	`47`	`inline void JuiControl::SetBounds( const JRectI& bounds )`
`52`	`48`	`{`
`53`		`- if(m_rcBounds.extent != bounds.extent)`
`54`		`- OnSizeChanged(m_rcBounds.extent);`
`55`		`-`
`56`		`- m_rcBounds = bounds;`
	`49`	`+ SetPosition(bounds.position);`
	`50`	`+ SetExtent(bounds.extent);`
`57`	`51`	`}`
`58`	`52`
`59`	`53`	`inline void JuiControl::SetExtent(const JPoint2I& size)`
`60`	`54`	`{`
`61`	`55`	`if(m_rcBounds.extent != size)`
`62`	`56`	`{`
`63`		`- OnSizeChanged(size);`
`64`	`57`	`m_rcBounds.extent = size;`
	`58`	`+ OnSizeChanged();`
`65`	`59`	`}`
`66`	`60`	`}`
`67`	`61`
`68`	`62`	`inline void JuiControl::SetExtent( int width, int height )`
`69`	`63`	`{`
`70`	`64`	`if(m_rcBounds.extent.x != width == m_rcBounds.extent.y != height)`
`71`	`65`	`{`
`72`		`- OnSizeChanged(JPoint2I(width,height));`
`73`	`66`	`m_rcBounds.extent.x = width;`
`74`	`67`	`m_rcBounds.extent.y = height;`
	`68`	`+ OnSizeChanged();`
`75`	`69`	`}`
`76`	`70`	`}`
`77`	`71`
`78`	`72`	`inline void JuiControl::SetWidth(int width)`
`79`	`73`	`{`
`80`	`74`	`if(m_rcBounds.extent.x != width)`
`81`	`75`	`{`
`82`		`- OnSizeChanged(JPoint2I(width,m_rcBounds.extent.y));`
`83`	`76`	`m_rcBounds.extent.x = width;`
	`77`	`+ OnSizeChanged();`
`84`	`78`	`}`
`85`	`79`	`}`
`86`	`80`
`87`	`81`	`inline void JuiControl::SetHeight(int height)`
`88`	`82`	`{`
`89`	`83`	`if(m_rcBounds.extent.y != height)`
`90`	`84`	`{`
`91`		`- OnSizeChanged(JPoint2I(m_rcBounds.extent.x,height));`
`92`	`85`	`m_rcBounds.extent.y = height;`
	`86`	`+ OnSizeChanged();`
`93`	`87`	`}`
`94`	`88`	`}`
`95`	`89`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ bool JuiReader::LoadScript( JuiContainer root, const char filename )`
`80`	`80`	`{`
`81`	`81`	`JuiContainer container = dynamic_cast<JuiContainer>(currObject);`
`82`	`82`	`if(container != NULL)`
`83`		`- container->OnSizeChanged(container->GetExtent());`
	`83`	`+ container->OnSizeChanged();`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if(stackIndex >= 0)`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ JuiEventManager * JuiFrame::GetInputGenerator()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`
`40`		`-void JuiFrame::OnSizeChanged(const JPoint2I& newSize)`
	`40`	`+void JuiFrame::OnSizeChanged()`
`41`	`41`	`{`
`42`		`- Parent::OnSizeChanged(newSize);`
`43`		`- JuiWindow::SetSize(newSize.x,newSize.y);`
	`42`	`+ Parent::OnSizeChanged();`
	`43`	`+ JuiWindow::SetSize(GetWidth(),GetHeight());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`bool JuiFrame::HandleHitTest( POINTS pt, LRESULT* result )`
Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,8 @@ void JuiFrameLayoutParameter::UpdateControl( JuiControl *pCtrl, const JPoint2I &`
`71`	`71`	`pCtrl->SetPosition(m_ptOrigPos);`
`72`	`72`	`}`
`73`	`73`
`74`		`-void JuiFrameLayoutParameter::UpdatePos(JuiContainer* pParent, JRectI& bound)`
	`74`	`+void JuiFrameLayoutParameter::UpdatePos(const JPoint2I &parentSize, JRectI& bound)`
`75`	`75`	`{`
`76`		`- if(pParent == NULL)`
`77`		`- return;`
`78`		`-`
`79`		`- JPoint2I parentSize = pParent->GetExtent();`
`80`	`76`	`m_ptOrigPos = bound.position;`
`81`	`77`
`82`	`78`	`if(m_Gravity == GRAVITY_RIGHT)`
`@@ -98,15 +94,15 @@ JuiFrameLayoutParameter* JuiFrameLayout::CreateParameter()`
`98`	`94`	`return new JuiFrameLayoutParameter;`
`99`	`95`	`}`
`100`	`96`
`101`		`-void JuiFrameLayout::OnSizeChanged(const JPoint2I& newSize)`
	`97`	`+void JuiFrameLayout::OnSizeChanged()`
`102`	`98`	`{`
`103`	`99`	`JuiControl* pCtrl = (JuiControl*)m_lsChilds.First();`
`104`	`100`	`while(pCtrl)`
`105`	`101`	`{`
`106`	`102`	`JuiFrameLayoutParameter pParam = static_cast<JuiFrameLayoutParameter>(pCtrl->GetLayoutParameter());`
`107`	`103`	`if(pParam != NULL)`
`108`	`104`	`{`
`109`		`- pParam->UpdateControl(pCtrl, newSize);`
	`105`	`+ pParam->UpdateControl(pCtrl, GetExtent());`
`110`	`106`	`}`
`111`	`107`
`112`	`108`	`pCtrl = (JuiControl*)m_lsChilds.Next();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class JuiLayoutParameter : public JObject`
`8`	`8`	`{`
`9`	`9`	`JDECLARE_ABSTRACT_CLASS(JuiLayoutParameter)`
`10`	`10`	`public:`
`11`		`- virtual void UpdatePos(JuiContainer* pParent, JRectI& bound) = 0;`
	`11`	`+ virtual void UpdatePos(const JPoint2I &parentSize, JRectI& bound) = 0;`
`12`	`12`	`};`
`13`	`13`
`14`	`14`	`#endif`