168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use astyle

This commit is contained in:
Peter Hartmann 2021-03-26 09:45:33 +01:00
parent 640cfd17d7
commit 10018cdabf
11 changed files with 145 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/iot-dashboard/MenuBar.cpp
View File

@ -39,7 +39,9 @@ MenuItem::MenuItem( const QString& name, QQuickItem* parent ) : QskLinearBox( Qt
QskAspect::Subcontrol MenuItem::effectiveSubcontrol( QskAspect::Subcontrol subControl ) const QskAspect::Subcontrol MenuItem::effectiveSubcontrol( QskAspect::Subcontrol subControl ) const
{ {
if( subControl == QskBox::Panel ) if( subControl == QskBox::Panel )
{
return MenuItem::Panel; return MenuItem::Panel;
}
return subControl; return subControl;
} }
@ -48,12 +50,16 @@ void MenuItem::setActive(bool active)
{ {
QColor color; QColor color;
if(active) { if( active )
{
color = Qt::white; color = Qt::white;
color.setAlphaF( 0.14 ); color.setAlphaF( 0.14 );
} else { }
else
{
color = Qt::transparent; color = Qt::transparent;
} }
setBackgroundColor( color ); setBackgroundColor( color );
} }

3
examples/iot-dashboard/TopBar.cpp
View File

@ -43,7 +43,8 @@ TopBar::TopBar(QQuickItem *parent) : QskLinearBox(Qt::Horizontal, parent)
"#6776FF", "#6100FF", "#6776FF", "#6100FF",
"#FFCE50", "#FF3122", "#FFCE50", "#FF3122",
// "#00ff00", "#ffffff", // ### remove // "#00ff00", "#ffffff", // ### remove
"#6776FF", "#6100FF"}; "#6776FF", "#6100FF"
};
int progressValues[] = {25, 45, 15, 86}; int progressValues[] = {25, 45, 15, 86};
int values[] = {175, 205, 115, 289}; int values[] = {175, 205, 115, 289};