Refactor.

xinhuang · Jan 10, 2012 · aa9fe08 · aa9fe08
1 parent 5ad58c8
commit aa9fe08
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 51 deletions.
diff --git a/MineGame_Lib/View/ConfigForm.cpp b/MineGame_Lib/View/ConfigForm.cpp
@@ -28,23 +28,23 @@ void ConfigForm::InitializeComponents()
 	Controls.Add(_d->widthLabel);
 	_d->widthLabel.set_AutoSize(true);
 	_d->widthLabel.set_Text(L"Width:");
-    _d->widthLabel.set_AnchorStyles(AnchorStyles::Left);
+    _d->widthLabel.set_Anchor(AnchorStyles::Left);
 
 	Controls.Add(_d->widthTextBox);
 	_d->widthTextBox.set_Location(Point(_d->widthLabel.get_Right(), _d->widthLabel.get_Location().Y));
 	_d->widthTextBox.set_Size(Size(get_Width() - _d->widthTextBox.get_Left() - 5, _d->widthLabel.get_Height()));
-	_d->widthTextBox.set_AnchorStyles(AnchorStyles::LeftRight);
+	_d->widthTextBox.set_Anchor(AnchorStyles::LeftRight);
 	_d->widthTextBox.set_BorderStyle(FormBorderStyle::FixedSingle);
 
 	Controls.Add(_d->heightLabel);
 	_d->heightLabel.set_Text(L"Height:");
 	_d->heightLabel.set_AutoSize(true);
 	_d->heightLabel.set_Location(Point(0, _d->widthLabel.get_Height() + gap));
-    _d->heightLabel.set_AnchorStyles(AnchorStyles::Left);
+    _d->heightLabel.set_Anchor(AnchorStyles::Left);
 
 	Controls.Add(_d->mineTotalLabel);
 	_d->mineTotalLabel.set_Text(L"Mines:");
 	_d->mineTotalLabel.set_AutoSize(true);
 	_d->mineTotalLabel.set_Location(Point(0, _d->heightLabel.get_Top() + _d->heightLabel.get_Height() + gap));
-    _d->mineTotalLabel.set_AnchorStyles(AnchorStyles::Left);
+    _d->mineTotalLabel.set_Anchor(AnchorStyles::Left);
 }
diff --git a/MineGame_Lib/View/MGameView.cpp b/MineGame_Lib/View/MGameView.cpp
@@ -125,7 +125,7 @@ void MGameView::InitializeComponents()
 	Controls.Add(_d->remainMines);
 	_d->remainMines.set_Location(Point(5, 5));
 	_d->remainMines.set_Size(Size(39, 24));
-	_d->remainMines.set_AnchorStyles(AnchorStyles::TopLeft);
+	_d->remainMines.set_Anchor(AnchorStyles::TopLeft);
 
 	ResumeLayout(true);
 

diff --git a/mUI/System.Forms/Control.cpp b/mUI/System.Forms/Control.cpp
@@ -119,11 +119,11 @@ void Control::PrivateLayout(Control& container, LayoutEventArgs* e)
 		Control& element = **iter;
 
 		Rectangle bounds = element.get_Bounds();
-		if (element.get_AnchorStyles() == AnchorStyles::None)
+		if (element.get_Anchor() == AnchorStyles::None)
 			continue;
-		if ((element.get_AnchorStyles() & AnchorStyles::Bottom) != 0)
+		if ((element.get_Anchor() & AnchorStyles::Bottom) != 0)
 		{
-			if ((element.get_AnchorStyles() & AnchorStyles::Top) != 0)
+			if ((element.get_Anchor() & AnchorStyles::Top) != 0)
 			{
 				bounds.Size.Height = container.get_Size().Height
 					- element._d->anchorInfo.Top
@@ -134,9 +134,9 @@ void Control::PrivateLayout(Control& container, LayoutEventArgs* e)
 				- element._d->anchorInfo.Bottom;
 			bounds.Location.Y = bounds.get_Top() + vertDelta;
 		}
-		if ((element.get_AnchorStyles() & AnchorStyles::Right) != 0)
+		if ((element.get_Anchor() & AnchorStyles::Right) != 0)
 		{
-			if ((element.get_AnchorStyles() & AnchorStyles::Left) != 0)
+			if ((element.get_Anchor() & AnchorStyles::Left) != 0)
 			{
 				bounds.Size.Width = container.get_Size().Width
 					- element._d->anchorInfo.Left
@@ -583,12 +583,12 @@ void Control::OnKeyPress( KeyPressEventArgs* e )
 	KeyPress(this, e);
 }
 
-void Control::set_AnchorStyles( AnchorStyles::Enum value )
+void Control::set_Anchor( AnchorStyles::Enum value )
 {
 	SetAnchor(value, *get_Parent());
 }
 
-AnchorStyles::Enum Control::get_AnchorStyles() const
+AnchorStyles::Enum Control::get_Anchor() const
 {
 	return _d->anchorStyles;
 }

diff --git a/mUI/System.Forms/Control.h b/mUI/System.Forms/Control.h
@@ -175,8 +175,8 @@ class FORMS_ENTRY Control : public ComponentModel::ISynchronizeInvoke, public Th
 	Control* get_Parent() { return parent_; }
 	const Control* get_Parent() const { return parent_; }
 
-	AnchorStyles::Enum get_AnchorStyles() const;
-	void set_AnchorStyles(AnchorStyles::Enum value);
+	AnchorStyles::Enum get_Anchor() const;
+	void set_Anchor(AnchorStyles::Enum value);
 
 	// ---------------------------------------------------------- //
 

diff --git a/mUI/System.Forms/Form.cpp b/mUI/System.Forms/Form.cpp
@@ -16,13 +16,14 @@ struct Form::Data
 		: dragMove(false)
 		, moving(false)
 		, topMost(false)
+		, borderStyle(FormBorderStyle::FixedSingle)
 	{}
 
 	bool topMost;
 	bool dragMove;
 	bool moving;
 	Point mouseDownLocation;
-	FormBorderStyle formBoarderStyle;
+	FormBorderStyle::Enum borderStyle;
 
 	static const int DEFAULT_WIDTH = 800;
 	static const int DEFAULT_HEIGHT = 600;
@@ -96,18 +97,18 @@ void Form::OnDeactivate( EventArgs* e )
 	Deactivate(this, e);
 }
 
-void Form::set_FormBorderStyle( const FormBorderStyle& style )
+void Form::set_FormBorderStyle( FormBorderStyle::Enum style )
 {
 	if (get_FormBorderStyle() != style)
 	{
-		_d->formBoarderStyle = style;
+		_d->borderStyle = style;
 		OnBorderStyleChanged(&EventArgs::Empty);
 	}
 }
 
-const FormBorderStyle& Form::get_FormBorderStyle() const
+FormBorderStyle::Enum Form::get_FormBorderStyle() const
 {
-	return _d->formBoarderStyle;
+	return _d->borderStyle;
 }
 
 void Form::OnBorderStyleChanged( EventArgs* e )

diff --git a/mUI/System.Forms/Form.h b/mUI/System.Forms/Form.h
@@ -54,8 +54,8 @@ class FORMS_ENTRY Form : public Control
 
 	virtual Point PointToScreen(Point pt) const;
 
-	const FormBorderStyle& get_FormBorderStyle() const;
-	void set_FormBorderStyle(const FormBorderStyle& style);
+	FormBorderStyle::Enum get_FormBorderStyle() const;
+	void set_FormBorderStyle(FormBorderStyle::Enum style);
 
 	Size get_ClientSize() const;
 

diff --git a/mUI/System.Forms/FormBorderStyle.h b/mUI/System.Forms/FormBorderStyle.h
@@ -14,15 +14,14 @@
 	limitations under the License.
 */
 
-#ifndef __FORMBOARDERSTYLE_H__
-#define __FORMBOARDERSTYLE_H__
+#ifndef __MUI_FORMS_FORMBORDERSTYLE_H__
+#define __MUI_FORMS_FORMBORDERSTYLE_H__
 
 namespace mUI{ namespace System{  namespace Forms{
 
-class FORMS_ENTRY FormBorderStyle
+namespace FormBorderStyle
 {
-public:
-	enum FBS {
+	enum Enum {
 		None,
 		FixedSingle,
 		//Fixed3D,			// Not supported yet
@@ -31,18 +30,8 @@ class FORMS_ENTRY FormBorderStyle
 		//FixedToolWindow,	// Not supported yet
 		//SizableToolWindow,	// Not supported yet
 	};
-
-	FormBorderStyle() : fbs_(None)
-	{}
-	FormBorderStyle(FBS fbs) : fbs_(fbs)
-	{}
-
-	operator FBS() const { return fbs_; }
-
-private:
-	FBS fbs_;
 };
 
 }}}
 
-#endif 
+#endif // __MUI_FORMS_FORMBORDERSTYLE_H__
diff --git a/mUI/System.Forms/Label.cpp b/mUI/System.Forms/Label.cpp
@@ -21,8 +21,8 @@ void Label::set_Text( const String& text )
 void Label::AdjustSize()
 {
 	if (!get_AutoSize() 
-		|| (get_AnchorStyles() & AnchorStyles::LeftRight) == AnchorStyles::LeftRight
-		|| (get_AnchorStyles() & AnchorStyles::TopBottom) == AnchorStyles::TopBottom)
+		|| (get_Anchor() & AnchorStyles::LeftRight) == AnchorStyles::LeftRight
+		|| (get_Anchor() & AnchorStyles::TopBottom) == AnchorStyles::TopBottom)
 		return;
 
 	Graphics* g = CreateGraphics();

diff --git a/mUI/System.Forms/TextBox.cpp b/mUI/System.Forms/TextBox.cpp
@@ -7,7 +7,7 @@ namespace mUI{ namespace System{  namespace Forms{
 
 struct TextBox::Data
 {
-	FormBorderStyle borderStyle;
+	FormBorderStyle::Enum borderStyle;
 };
 
 TextBox::TextBox() : _d(new Data())
@@ -35,8 +35,8 @@ void TextBox::set_Text( const String& text )
 void TextBox::AdjustSize()
 {
 	if (!get_AutoSize() 
-		|| (get_AnchorStyles() & AnchorStyles::LeftRight) == AnchorStyles::LeftRight
-		|| (get_AnchorStyles() & AnchorStyles::TopBottom) == AnchorStyles::TopBottom)
+		|| (get_Anchor() & AnchorStyles::LeftRight) == AnchorStyles::LeftRight
+		|| (get_Anchor() & AnchorStyles::TopBottom) == AnchorStyles::TopBottom)
 		return;
 
 	Graphics* g = CreateGraphics();
@@ -55,7 +55,7 @@ void TextBox::OnKeyPress( KeyPressEventArgs* e )
 	set_Text(get_Text() + e->KeyChar);
 }
 
-void TextBox::set_BorderStyle( FormBorderStyle borderStyle )
+void TextBox::set_BorderStyle( FormBorderStyle::Enum borderStyle )
 {
 	_d->borderStyle = borderStyle;
 	Update();

diff --git a/mUI/System.Forms/TextBox.h b/mUI/System.Forms/TextBox.h
@@ -18,7 +18,7 @@ class FORMS_ENTRY TextBox : public Control
 
 	virtual void set_Text(const String& text);
 	virtual void set_AutoSize(bool value);
-	void set_BorderStyle( FormBorderStyle borderStyle );
+	void set_BorderStyle( FormBorderStyle::Enum borderStyle );
 
 protected:
 	virtual void OnPaint( PaintEventArgs* e );

diff --git a/mUI_UnitTest/ControlTest.cpp b/mUI_UnitTest/ControlTest.cpp
@@ -203,7 +203,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleTop)
 	Rectangle arbitraryBounds(30, 30, 10, 10);
 	AddChildCtrl(arbitraryBounds);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::Top);
+	_childCtrl->set_Anchor(AnchorStyles::Top);
 	_sut->set_Size(Size(200, 200));
 
 	ASSERT_EQ(arbitraryBounds.Location, _childCtrl->get_Location());
@@ -217,7 +217,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleBottom)
 
 	int expectDistance = DistanceFromChildBottomToParentBottom(*_sut, *_childCtrl);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::Bottom);
+	_childCtrl->set_Anchor(AnchorStyles::Bottom);
 	_sut->set_Size(Size(200, 200));
 
 	ASSERT_EQ(arbitraryBounds.Location.X, _childCtrl->get_Location().X);
@@ -230,7 +230,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleLeft)
 	Rectangle arbitraryBounds(30, 30, 10, 10);
 	AddChildCtrl(arbitraryBounds);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::Left);
+	_childCtrl->set_Anchor(AnchorStyles::Left);
 	_sut->set_Size(Size(200, 200));
 
 	ASSERT_EQ(arbitraryBounds.Location, _childCtrl->get_Location());
@@ -243,7 +243,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleRight)
 	AddChildCtrl(arbitraryBounds);
 	int expectedDistance = DistanceFromChildRightToParentRight(*_sut, *_childCtrl);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::Right);
+	_childCtrl->set_Anchor(AnchorStyles::Right);
 	_sut->set_Size(Size(200, 200));
 
 	ASSERT_EQ(expectedDistance, DistanceFromChildRightToParentRight(*_sut, *_childCtrl));
@@ -261,7 +261,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleTopBottom)
 
 	int expectDistance = DistanceFromChildBottomToParentBottom(*_sut, *_childCtrl);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::TopBottom);
+	_childCtrl->set_Anchor(AnchorStyles::TopBottom);
 	_sut->set_Size(Size(333, newHeight));
 
 	ASSERT_EQ(arbitraryBounds.Location.X, _childCtrl->get_Location().X);
@@ -279,7 +279,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleLeftRight)
 
 	int expectDistance = DistanceFromChildBottomToParentBottom(*_sut, *_childCtrl);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::LeftRight);
+	_childCtrl->set_Anchor(AnchorStyles::LeftRight);
 	_sut->set_Size(Size(newWidth, 333));
 
 	ASSERT_EQ(arbitraryBounds.Location.X, _childCtrl->get_Location().X);
@@ -297,7 +297,7 @@ TEST_F(ControlTest, PerformLayout_WhenAnchorStyleAll)
 	int expectVertDistance = DistanceFromChildBottomToParentBottom(*_sut, *_childCtrl);
 	int expectHoriDistance = DistanceFromChildRightToParentRight(*_sut, *_childCtrl);
 
-	_childCtrl->set_AnchorStyles(AnchorStyles::All);
+	_childCtrl->set_Anchor(AnchorStyles::All);
 	_sut->set_Size(Size(newWidth, newHeight));
 
 	ASSERT_EQ(arbitraryBounds.Location.X, _childCtrl->get_Location().X);