Merge pull request #740 from RainCT/groupsfix

wjwwood · wjwwood · commit 8ed280986366 · 2014-04-29T15:06:00.000-07:00
Fix disabling of groups (#709)
diff --git a/src/rviz/properties/property.cpp b/src/rviz/properties/property.cpp
@@ -279,7 +279,7 @@ Qt::ItemFlags Property::getViewFlags( int column ) const
 {
   // if the parent propery is a disabled bool property or
   // has its own enabled view flag not set, disable this property as well
-  Qt::ItemFlags enabled_flag = Qt::ItemIsEnabled;//is_read_only_ || ( parent_ && parent_->getDisableChildren() ) ? Qt::NoItemFlags : Qt::ItemIsEnabled;
+  Qt::ItemFlags enabled_flag = ( parent_ && parent_->getDisableChildren() ) ? Qt::NoItemFlags : Qt::ItemIsEnabled;  // || is_read_only_
 
   if( column == 0 )
   {

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ Qt::ItemFlags Property::getViewFlags( int column ) const`
`279`	`279`	`{`
`280`	`280`	`// if the parent propery is a disabled bool property or`
`281`	`281`	`// has its own enabled view flag not set, disable this property as well`
`282`		`- Qt::ItemFlags enabled_flag = Qt::ItemIsEnabled;//is_read_only_ \|\| ( parent_ && parent_->getDisableChildren() ) ? Qt::NoItemFlags : Qt::ItemIsEnabled;`
	`282`	`+ Qt::ItemFlags enabled_flag = ( parent_ && parent_->getDisableChildren() ) ? Qt::NoItemFlags : Qt::ItemIsEnabled; // \|\| is_read_only_`
`283`	`283`
`284`	`284`	`if( column == 0 )`
`285`	`285`	`{`