Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: use zero as minimum space for spacers

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-09-29 16:10:41 +03:00
parent ba2d235f76
commit d917321a5d
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/plasmagenericshell/widgetsexplorer/widgetexplorer.cpp
View file

@ -328,7 +328,7 @@ void WidgetExplorerPrivate::init(const Plasma::Location loc)
topSpacer = new Plasma::Label(q);
topSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
topSpacer->setMinimumSize(1, 1);
topSpacer->setMinimumSize(0, 0);
mainLayout->addItem(topSpacer, 0, 1);
categoriesButton = new Plasma::ToolButton(q);

2
plasma/applets/mixer/mixer.cpp
View file

@ -212,7 +212,7 @@ static QGraphicsWidget* kMakeSpacer(QGraphicsWidget *parent)
{
QGraphicsWidget* result = new QGraphicsWidget(parent);
result->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
result->setMinimumSize(1, 1);
result->setMinimumSize(0, 0);
return result;
}

14
plasma/applets/tasks/tasks.cpp
View file

@ -116,13 +116,13 @@ void TasksSvg::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
m_framesvg->setElementPrefix(kElementPrefixForTask(m_task, m_hovered, isactive, demandsattention));
m_framesvg->resizeFrame(brectsize);
m_framesvg->paintFrame(painter, brect);
const int spacingoffset = (s_spacing * 2);
const int spacingx2 = (s_spacing * 2);
const int iconsize = qRound(qMin(brectsize.width(), brectsize.height()));
QPixmap iconpixmap = KIcon(m_task.icon).pixmap(iconsize);
if (!iconpixmap.isNull()) {
iconpixmap = iconpixmap.scaled(
iconsize - spacingoffset,
iconsize - spacingoffset,
iconsize - spacingx2,
iconsize - spacingx2,
Qt::KeepAspectRatio, Qt::SmoothTransformation
);
}
@ -175,12 +175,8 @@ void TasksSvg::slotClicked(const Qt::MouseButton button)
void TasksSvg::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
{
QMenu* taskmenu = KTaskManager::menuForTask(m_task, nullptr);
if (!taskmenu) {
Plasma::SvgWidget::contextMenuEvent(event);
return;
}
event->accept();
QMenu* taskmenu = KTaskManager::menuForTask(m_task, nullptr);
taskmenu->exec(QCursor::pos());
taskmenu->deleteLater();
}
@ -305,7 +301,7 @@ void TasksApplet::slotUpdateLayout()
if (!m_spacer) {
m_spacer = new QGraphicsWidget(this);
m_spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_spacer->setMinimumSize(1, 1);
m_spacer->setMinimumSize(0, 0);
}
m_layout->addItem(m_spacer);
}