From 7b36a0e8d7c7eb9b582be90ce1bc0502aeb81cf8 Mon Sep 17 00:00:00 2001 From: "Siegfried-A. Gevatter Pujals" Date: Thu, 13 Mar 2014 11:24:15 +0100 Subject: [PATCH] Fix disabling of groups (#709) This was broken with commit 5897285, which reverted the changes in commit c6dacb1, but rather than only removing the change concerning the read-only attribute, commented out the entire check, including the parent_->getDisableChildren() call (which existed prior to commit 5897285). --- src/rviz/properties/property.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rviz/properties/property.cpp b/src/rviz/properties/property.cpp index f21634bd43..a26e2bc8c0 100644 --- 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 ) {