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

List:       haiku-commits
Subject:    [Haiku-commits] r30920 - haiku/trunk/src/kits/interface
From:       korli at BerliOS <korli () mail ! berlios ! de>
Date:       2009-05-30 11:37:25
Message-ID: 200905301137.n4UBbPCK029962 () sheep ! berlios ! de
[Download RAW message or body]

Author: korli
Date: 2009-05-30 13:37:25 +0200 (Sat, 30 May 2009)
New Revision: 30920
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30920&view=rev

Modified:
   haiku/trunk/src/kits/interface/View.cpp
Log:
* merged Frame and Hidden properties (set and get) (bug #3493).
* changed Hidden set property to not check the current hidden state, as it's not exactly related.


Modified: haiku/trunk/src/kits/interface/View.cpp
===================================================================
--- haiku/trunk/src/kits/interface/View.cpp	2009-05-30 11:10:23 UTC (rev 30919)
+++ haiku/trunk/src/kits/interface/View.cpp	2009-05-30 11:37:25 UTC (rev 30920)
@@ -71,22 +71,14 @@
 
 
 static property_info sViewPropInfo[] = {
-	{ "Frame", { B_GET_PROPERTY, 0 },
-		{ B_DIRECT_SPECIFIER, 0 }, "Returns the view's frame rectangle.", 0,
+	{ "Frame", { B_GET_PROPERTY, B_SET_PROPERTY },
+		{ B_DIRECT_SPECIFIER, 0 }, "The view's frame rectangle.", 0,
 		{ B_RECT_TYPE }
 	},
-	{ "Frame", { B_SET_PROPERTY, 0 },
-		{ B_DIRECT_SPECIFIER, 0 }, "Sets the view's frame rectangle.", 0,
-		{ B_RECT_TYPE }
-	},
-	{ "Hidden", { B_GET_PROPERTY, 0 },
-		{ B_DIRECT_SPECIFIER, 0 }, "Returns wether or not the view is hidden.",
+	{ "Hidden", { B_GET_PROPERTY, B_SET_PROPERTY },
+		{ B_DIRECT_SPECIFIER, 0 }, "Whether or not the view is hidden.",
 		0, { B_BOOL_TYPE }
 	},
-	{ "Hidden", { B_SET_PROPERTY, 0 },
-		{ B_DIRECT_SPECIFIER, 0 }, "Hides or shows the view.", 0,
-		{ B_BOOL_TYPE }
-	},
 	{ "Shelf", { 0 },
 		{ B_DIRECT_SPECIFIER, 0 }, "Directs the scripting message to the "
 			"shelf.", 0
@@ -4060,12 +4052,10 @@
 	switch (propertyInfo.FindMatch(msg, index, specifier, what, property)) {
 		case 0:
 		case 1:
-		case 2:
 		case 3:
-		case 5:
 			return this;
 
-		case 4:
+		case 2:
 			if (fShelf) {
 				msg->PopSpecifier();
 				return fShelf;
@@ -4075,7 +4065,7 @@
 			replyMsg.AddString("message", "This window doesn't have a shelf");
 			break;
 
-		case 6:
+		case 4:
 		{
 			if (!fFirstChild) {
 				err = B_NAME_NOT_FOUND;
@@ -4225,33 +4215,32 @@
 	BPropertyInfo propertyInfo(sViewPropInfo);
 	switch (propertyInfo.FindMatch(msg, index, &specifier, what, prop)) {
 		case 0:
-			err = replyMsg.AddRect("result", Frame());
+			if (msg->what == B_GET_PROPERTY) {
+				err = replyMsg.AddRect("result", Frame());
+			} else if (msg->what == B_SET_PROPERTY) {
+				BRect newFrame;
+				err = msg->FindRect("data", &newFrame);
+				if (err == B_OK) {
+					MoveTo(newFrame.LeftTop());
+					ResizeTo(newFrame.right, newFrame.bottom);
+				}
+			}
 			break;
 		case 1:
-		{
-			BRect newFrame;
-			err = msg->FindRect("data", &newFrame);
-			if (err == B_OK) {
-				MoveTo(newFrame.LeftTop());
-				ResizeTo(newFrame.right, newFrame.bottom);
+			if (msg->what == B_GET_PROPERTY) {
+				err = replyMsg.AddBool("result", IsHidden());
+			} else if (msg->what == B_SET_PROPERTY) {
+				bool newHiddenState;
+				err = msg->FindBool("data", &newHiddenState);
+				if (err == B_OK) {
+					if (newHiddenState == true)
+						Hide();
+					else 
+						Show();
+				}
 			}
 			break;
-		}
 		case 2:
-			err = replyMsg.AddBool( "result", IsHidden());
-			break;
-		case 3:
-		{
-			bool newHiddenState;
-			err = msg->FindBool("data", &newHiddenState);
-			if (err == B_OK) {
-				if (!IsHidden() && newHiddenState == true)
-					Hide();
-				else if (IsHidden() && newHiddenState == false)
-					Show();
-			}
-		}
-		case 5:
 			err = replyMsg.AddInt32("result", CountChildren());
 			break;
 		default:

_______________________________________________
Haiku-commits mailing list
Haiku-commits@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/haiku-commits
[prev in list] [next in list] [prev in thread] [next in thread]