napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use semitransparent overlay rounded rect for PBV selection.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-12-11 16:52:06 +01:00
parent 7c80f846f1
commit 5aa8cd4a9b
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/partition/gui/PartitionBarsView.cpp
View File

@ -112,19 +112,18 @@ PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, in
rect.adjust( 0, 0, -1, -1 ); rect.adjust( 0, 0, -1, -1 );
QColor borderColor;
if ( m_hoveredIndex.isValid() && if ( m_hoveredIndex.isValid() &&
index == m_hoveredIndex ) index == m_hoveredIndex )
{ {
borderColor = palette().highlight().color();
painter->setBrush( color.lighter( 115 ) ); painter->setBrush( color.lighter( 115 ) );
} }
else else
{ {
borderColor = color.darker();
painter->setBrush( color ); painter->setBrush( color );
} }
QColor borderColor = color.darker();
painter->setPen( borderColor ); painter->setPen( borderColor );
painter->drawRoundedRect( rect, radius, radius ); painter->drawRoundedRect( rect, radius, radius );
@ -140,9 +139,41 @@ PartitionBarsView::drawSection( QPainter* painter, const QRect& rect_, int x, in
gradient.setColorAt( 1, QColor::fromRgbF( c, c, c, 0 ) ); gradient.setColorAt( 1, QColor::fromRgbF( c, c, c, 0 ) );
painter->setPen( Qt::NoPen ); painter->setPen( Qt::NoPen );
painter->setBrush( gradient ); painter->setBrush( gradient );
painter->drawRoundedRect( rect, radius, radius ); painter->drawRoundedRect( rect, radius, radius );
if ( index.isValid() &&
currentIndex() == index )
{
painter->setPen( QPen( borderColor, 1 ) );
QColor highlightColor = QPalette().highlight().color();
highlightColor = highlightColor.lighter( 500 );
highlightColor.setAlpha( 120 );
painter->setBrush( highlightColor );
const int SEL_PADDING = 2;
QRect selectionRect = rect;
selectionRect.setX( x + 1 );
selectionRect.setWidth( width - 3 ); //account for the previous rect.adjust
if ( rect.x() > selectionRect.x() ) //hack for first item
selectionRect.adjust( rect.x() - selectionRect.x(), 0, 0, 0 );
if ( rect.right() < selectionRect.right() ) //hack for last item
selectionRect.adjust( 0, 0, - ( selectionRect.right() - rect.right() ), 0 );
selectionRect.adjust( SEL_PADDING,
SEL_PADDING,
-SEL_PADDING,
-SEL_PADDING );
painter->drawRoundedRect( selectionRect,
radius - 1,
radius - 1 );
}
painter->translate( -0.5, -0.5 ); painter->translate( -0.5, -0.5 );
} }