Display encrypted file system colour correctly in the disk graphic (#760080)

In the main window disk graphic, when there is an open dm-crypt mapping,
display the colour of the encrypted file system.

Bug 760080 - Implement read-only LUKS support
This commit is contained in:
Mike Fleetwood 2015-12-31 13:21:17 +00:00 committed by Curtis Gedak
parent cb3cc505ce
commit a58e85d193
1 changed files with 8 additions and 1 deletions

View File

@ -17,6 +17,7 @@
#include "../include/DrawingAreaVisualDisk.h"
#include "../include/Partition.h"
#include "../include/PartitionLUKS.h"
#include "../include/PartitionVector.h"
#include "../include/Utils.h"
@ -99,7 +100,13 @@ void DrawingAreaVisualDisk::set_static_data( const PartitionVector & partitions,
Sector partition_length = partitions[ t ] .get_sector_length() ;
visual_partitions .back() .fraction = partition_length / static_cast<double>( length ) ;
visual_partitions.back().color.set( Utils::get_color( partitions[t].filesystem ) );
Glib::ustring color_str = Utils::get_color( partitions[t].filesystem );
if ( partitions[t].filesystem == FS_LUKS && partitions[t].busy )
{
const Partition & encrypted = dynamic_cast<const PartitionLUKS *>( &partitions[t] )->get_encrypted();
color_str = Utils::get_color( encrypted.filesystem );
}
visual_partitions.back().color.set( color_str );
get_colormap() ->alloc_color( visual_partitions .back() .color );
if ( partitions[ t ] .type == GParted::TYPE_EXTENDED )