diff options
| author | william <william.os4y@gmail.com> | 2015-03-26 19:18:45 +0100 |
|---|---|---|
| committer | william <william.os4y@gmail.com> | 2015-03-26 19:18:45 +0100 |
| commit | 851c91e92ef57de3cdec582048a134ff5b5552f8 (patch) | |
| tree | 8d7119048c2ca9b3f60c9a8a2f5699f6a18eb1b2 /lumina-desktop/panel-plugins/taskmanager | |
| parent | Warn the user is they want to change a elemnt having translated values. (diff) | |
| parent | Actually move the file/dir copy onto itself check earlier in the procedure, t... (diff) | |
| download | lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.tar.gz lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.tar.bz2 lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.zip | |
Merge remote-tracking branch 'upstream/master' into deskEditor
Diffstat (limited to 'lumina-desktop/panel-plugins/taskmanager')
| -rw-r--r-- | lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp index 7c24dc3d..20607c60 100644 --- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp +++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp @@ -121,13 +121,14 @@ void LTaskButton::UpdateButton(){ //single window this->setPopupMode(QToolButton::DelayedPopup); this->setMenu(actMenu); - if(showText){ this->setText( this->fontMetrics().elidedText(WINLIST[0].text(), Qt::ElideRight,80) ); } - else if(noicon){ this->setText( this->fontMetrics().elidedText(cname, Qt::ElideRight ,80) ); } - else{ this->setText(""); } + if(showText){ this->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); this->setText( this->fontMetrics().elidedText(WINLIST[0].text(), Qt::ElideRight,80) ); } + else if(noicon){ this->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); this->setText( this->fontMetrics().elidedText(cname, Qt::ElideRight ,80) ); } + else{ this->setToolButtonStyle(Qt::ToolButtonIconOnly); this->setText(""); } }else if(WINLIST.length() > 1){ //multiple windows this->setPopupMode(QToolButton::InstantPopup); this->setMenu(winMenu); + this->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); if(noicon || showText){ this->setText( this->fontMetrics().elidedText(cname, Qt::ElideRight ,80) +" ("+QString::number(WINLIST.length())+")" ); } else{ this->setText("("+QString::number(WINLIST.length())+")"); } } |