Changeset 13152b2


Ignore:
Timestamp:
08/01/14 06:27:30 (7 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.3
Children:
dbb9f28
Parents:
c757fbb
Message:

More visual updates for Lumina-desktop.
1) Finish cleaning up the new systemdashboard appearance
2) Customize the default menu appearance
3) Provide a QProxyStyle that ensures that icons in menus are 22x22 instead of 14x14

Location:
lumina/lumina-desktop
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-desktop/LSession.cpp

    r3be36c1 r13152b2  
    2222  this->setEffectEnabled( Qt::UI_AnimateCombo, true); 
    2323  this->setEffectEnabled( Qt::UI_AnimateTooltip, true); 
     24  this->setStyle( new MenuProxyStyle); //QMenu icon size override 
    2425  LuminaSessionTrayID = 0; 
    2526} 
  • lumina/lumina-desktop/LSession.h

    rf71b232 r13152b2  
    1515#include <QTranslator> 
    1616#include <QSettings> 
     17#include <QProxyStyle> 
    1718 
    1819#include "Globals.h" 
     
    2930#define SYSTEM_TRAY_CANCEL_MESSAGE 2 
    3031 
     32class MenuProxyStyle : public QProxyStyle{ 
     33public:  
     34        int pixelMetric(PixelMetric metric, const QStyleOption *option=0, const QWidget *widget=0) const{ 
     35          if(metric==PM_SmallIconSize){ return 22; } //override QMenu icon size (make it larger) 
     36          else{ return QProxyStyle::pixelMetric(metric, option, widget); } //use the current style for everything else 
     37        } 
     38}; 
    3139 
    3240class LSession : public QApplication{ 
  • lumina/lumina-desktop/defaults/stylesheet.qss

    rf71b232 r13152b2  
    11QToolTip{  
    2 background: rgb(240,240,240); 
    3 border: 1px solid grey; 
    4 padding: 1px;  
    5 color: black;  
     2    background: rgb(240,240,240); 
     3    border: 1px solid transparent; 
     4    padding: 1px;  
     5    color: black;  
    66} 
     7QMenu { 
     8     background-color: rgb(240,240,240); 
     9     border: 1px solid transparent; 
     10     margin: 2px; /* some spacing around the menu */ 
     11     color: black 
     12 } 
     13 QMenu::item { 
     14     padding: 2px 25px 2px 36px; 
     15     border: 1px solid transparent; /* reserve space for selection border */ 
     16 } 
     17 QMenu::item:selected { 
     18     border: 1px solid black; 
     19     border-radius: 3px; 
     20     background: rgba(130, 130, 130, 150); 
     21 } 
     22 QMenu::indicator { 
     23     width: 22px; 
     24     height: 22px; 
     25 } 
     26 QMenu::icon { 
     27   width: 32px; 
     28   height: 32px; 
     29 } 
  • lumina/lumina-desktop/panel-plugins/systemdashboard/SysMenuQuick.ui

    rc757fbb r13152b2  
    2424subcontrol-position: top center; 
    2525padding: 0 3px; 
    26 background-color: rgba(255,255,255,200); 
     26background-color: rgba(255,255,255,255); 
    2727border-radius: 5px; 
    2828font-weight: bold; 
Note: See TracChangeset for help on using the changeset viewer.