diff options
author | Ken Moore <ken@ixsystems.com> | 2016-12-23 11:47:30 -0500 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2016-12-23 11:47:30 -0500 |
commit | c880254cf13ba16697a948e4ac0478ebfd602ac5 (patch) | |
tree | 8386ffca6de834f7d5287793a9b4d6d8bb85d2e6 /src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp | |
parent | Merge branch 'master' of github.com:trueos/lumina (diff) | |
download | lumina-c880254cf13ba16697a948e4ac0478ebfd602ac5.tar.gz lumina-c880254cf13ba16697a948e4ac0478ebfd602ac5.tar.bz2 lumina-c880254cf13ba16697a948e4ac0478ebfd602ac5.zip |
Clean up some vertical-panel issues with the clock plugin and the system tray.
Diffstat (limited to 'src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp')
-rw-r--r-- | src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp index b6af4451..a71fd57e 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp @@ -117,10 +117,14 @@ void LSysTray::checkAll(){ LI->addWidget(cont); //qDebug() << " - Update tray layout"; if(this->layout()->direction()==QBoxLayout::LeftToRight){ - cont->setSizeSquare(this->height()-2-2*frame->frameWidth()); //horizontal tray + int sz = this->height()-2-2*frame->frameWidth(); + if(sz>64){ sz = 64; } + cont->setSizeSquare(sz); //horizontal tray this->setMaximumSize( trayIcons.length()*this->height(), 10000); }else{ - cont->setSizeSquare(this->width()-2-2*frame->frameWidth()); //vertical tray + int sz = this->width()-2-2*frame->frameWidth(); + if(sz>64){ sz = 64; } + cont->setSizeSquare(sz); //vertical tray this->setMaximumSize(10000, trayIcons.length()*this->width()); } //LSession::processEvents(); @@ -161,4 +165,3 @@ void LSysTray::UpdateTrayWindow(WId win){ QTimer::singleShot(0,this, SLOT(checkAll()) ); } - |