kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-11 13:18:13 +03:00
Code Issues Projects Releases Wiki Activity

use all cell height for free activities icon

Browse Source
This commit is contained in:
Michail Vourlakos 2020-03-19 01:56:01 +02:00
parent 2bc4e63431
commit b960a8579e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/settings/delegates/backgroundcmbdelegate.cpp
View File

@ -22,6 +22,7 @@
// local
#include "backgroundcmbitemdelegate.h"
#include "../data/activitydata.h"
#include "../data/layoutdata.h"
#include "../models/layoutsmodel.h"
#include "../tools/settingstools.h"
@ -130,6 +131,7 @@ void BackgroundCmbBox::paint(QPainter *painter, const QStyleOptionViewItem &opti
if (allActivitiesData.contains(id)) {
IconData icon;
icon.isBackground = false;
icon.isFreeActivities = (id == Data::Layout::FREEACTIVITIESID);
icon.name = allActivitiesData[id].icon;
icons << icon;
}
@ -143,6 +145,7 @@ void BackgroundCmbBox::paint(QPainter *painter, const QStyleOptionViewItem &opti
if (QFileInfo(colorPath).exists()) {
IconData icon;
icon.isBackground = true;
icon.isFreeActivities = false;
icon.name = colorPath;
icons << icon;
}
@ -151,6 +154,10 @@ void BackgroundCmbBox::paint(QPainter *painter, const QStyleOptionViewItem &opti
if (icons.count() > 0) {
int localMargin = icons[0].isBackground ? MARGIN+1 : MARGIN-1;
if (icons[0].isFreeActivities) {
localMargin = 0;
}
int aY = option.rect.y() + localMargin;
int thick = option.rect.height() - localMargin*2;

1
app/settings/delegates/backgroundcmbdelegate.h
View File

@ -33,6 +33,7 @@ namespace Delegate {
struct IconData
{
bool isFreeActivities{false};
bool isBackground{true};
QString name;
};