Fix decoration titlebar double-click and wheel event detection on

decorations that have an upper outer padding defined.

svn path=/trunk/KDE/kdebase/workspace/; revision=980189
This commit is contained in:
Lucas Murray 2009-06-11 11:49:50 +00:00
parent d2e10a529f
commit 7b488277a5

View file

@ -715,7 +715,8 @@ void KCommonDecoration::mouseDoubleClickEvent(QMouseEvent *e)
if( e->button() != Qt::LeftButton ) if( e->button() != Qt::LeftButton )
return; return;
int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); int tb = layoutMetric(LM_TitleEdgeTop) + layoutMetric(LM_TitleHeight) +
layoutMetric(LM_TitleEdgeBottom) + layoutMetric(LM_OuterPaddingTop);
// when shaded, react on double clicks everywhere to make it easier to unshade. otherwise // when shaded, react on double clicks everywhere to make it easier to unshade. otherwise
// react only on double clicks in the title bar region... // react only on double clicks in the title bar region...
if (isSetShade() || e->pos().y() <= tb ) if (isSetShade() || e->pos().y() <= tb )
@ -724,7 +725,8 @@ void KCommonDecoration::mouseDoubleClickEvent(QMouseEvent *e)
void KCommonDecoration::wheelEvent(QWheelEvent *e) void KCommonDecoration::wheelEvent(QWheelEvent *e)
{ {
int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); int tb = layoutMetric(LM_TitleEdgeTop) + layoutMetric(LM_TitleHeight) +
layoutMetric(LM_TitleEdgeBottom) + layoutMetric(LM_OuterPaddingTop);
if (isSetShade() || e->pos().y() <= tb ) if (isSetShade() || e->pos().y() <= tb )
titlebarMouseWheelOperation( e->delta()); titlebarMouseWheelOperation( e->delta());
} }