Skip to content

Commit

Permalink
Fix disabling of groups (ros-visualization#709)
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
RainCT committed Mar 13, 2014
1 parent be01337 commit 7b36a0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/rviz/properties/property.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down

0 comments on commit 7b36a0e

Please sign in to comment.