32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
|
From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aaron Seigo <aseigo@kde.org>
|
||
|
|
Date: Mon, 27 Jul 2009 21:46:22 -0600
|
||
|
|
Subject: [PATCH 15/18] Make QMenu respect the minimum width set
|
||
|
|
|
||
|
|
If one sets a minimum width on a QMenu and that size is larger than the
|
||
|
|
smallest size needed by the large menu item, it ignores the minimum
|
||
|
|
width and just uses the largest menu item size.
|
||
|
|
|
||
|
|
This results in ugly painting artifacts. This currently affects
|
||
|
|
(at least) the tasks widget in Plasma in KDE4.
|
||
|
|
---
|
||
|
|
src/gui/widgets/qmenu.cpp | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
|
||
|
|
index 9fbbb04..5d62ea6 100644
|
||
|
|
--- a/src/gui/widgets/qmenu.cpp
|
||
|
|
+++ b/src/gui/widgets/qmenu.cpp
|
||
|
|
@@ -280,7 +280,7 @@ void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAc
|
||
|
|
|
||
|
|
|
||
|
|
if (!sz.isEmpty()) {
|
||
|
|
- max_column_width = qMax(max_column_width, sz.width());
|
||
|
|
+ max_column_width = qMax(q->minimumWidth(), qMax(max_column_width, sz.width()));
|
||
|
|
//wrapping
|
||
|
|
if (!scroll &&
|
||
|
|
y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
|
||
|
|
--
|
||
|
|
1.6.2.5
|
||
|
|
|