| -rw-r--r-- | korganizer/koagenda.cpp | 54 |
1 files changed, 52 insertions, 2 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index fc213d8..b99625c 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -458,3 +458,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) } - + bool objIsNotViewport = (object != viewport()); switch (me->type()) { @@ -469,3 +469,53 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) mPopupPos = me->globalPos(); - if (object != viewport()) { + if ( objIsNotViewport ) { + KOAgendaItem * tempItem = (KOAgendaItem *)object; + if (mAllDayMode) { + if ( tempItem->height() > 10 ) { + int minV = tempItem->height()/4; + if ( minV > (blockmoveDist/2)-2 ) + minV = (blockmoveDist/2)-2; + bool border = false; + int diff = tempItem->y() - viewportPos.y(); + if ( diff < 0 ) + diff *= -1; + if ( diff < minV ) { + border = true; + objIsNotViewport = false; + } + if ( ! border ) { + diff = tempItem->y() + tempItem->height()- viewportPos.y(); + if ( diff < 0 ) + diff *= -1; + if ( diff < minV ) { + border = true; + objIsNotViewport = false; + } + } + } + } else { // not allday + if ( tempItem->width() > 10 ) { + int minH = tempItem->width()/4; + if ( minH > (blockmoveDist/2)-2 ) + minH = (blockmoveDist/2)-2; + bool border = false; + int diff = tempItem->x() - viewportPos.x(); + if ( diff < 0 ) + diff *= -1; + if ( diff < minH ) { + border = true; + objIsNotViewport = false; + } + if ( ! border ) { + diff = tempItem->x() + tempItem->width() - viewportPos.x(); + if ( diff < 0 ) + diff *= -1; + if ( diff < minH ) { + border = true; + objIsNotViewport = false; + } + } + } + } + } + if ( objIsNotViewport ) { mPopupItem = (KOAgendaItem *)object; |