Hello community, here is the log from the commit of package kolourpaint for openSUSE:Factory checked in at 2014-05-22 06:49:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kolourpaint (Old) and /work/SRC/openSUSE:Factory/.kolourpaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kolourpaint" Changes: -------- --- /work/SRC/openSUSE:Factory/kolourpaint/kolourpaint.changes 2014-04-18 12:36:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kolourpaint.new/kolourpaint.changes 2014-05-22 06:49:58.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:43:50 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- kolourpaint-4.13.0.tar.xz New: ---- kolourpaint-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kolourpaint.spec ++++++ --- /var/tmp/diff_new_pack.EetNdH/_old 2014-05-22 06:50:00.000000000 +0200 +++ /var/tmp/diff_new_pack.EetNdH/_new 2014-05-22 06:50:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: kolourpaint -Version: 4.13.0 +Version: 4.13.1 Release: 0 # See bnc#717722 for license details Summary: Paint Program ++++++ kolourpaint-4.13.0.tar.xz -> kolourpaint-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.13.0/layers/selections/image/kpAbstractImageSelection.cpp new/kolourpaint-4.13.1/layers/selections/image/kpAbstractImageSelection.cpp --- old/kolourpaint-4.13.0/layers/selections/image/kpAbstractImageSelection.cpp 2013-11-29 15:28:41.000000000 +0100 +++ new/kolourpaint-4.13.1/layers/selections/image/kpAbstractImageSelection.cpp 2014-05-04 19:02:28.000000000 +0200 @@ -334,7 +334,10 @@ void kpAbstractImageSelection::setBaseImage (const kpImage &baseImage) { Q_ASSERT (::CanSetBaseImageTo (this, baseImage)); - d->baseImage = baseImage; + + // qt doc: the image format must be set to Format_ARGB32Premultiplied or Format_ARGB32 + // for the composition modes to have any effect + d->baseImage = baseImage.convertToFormat(QImage::Format_ARGB32_Premultiplied); recalculateTransparencyMaskCache (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.13.0/mainWindow/kpMainWindow.cpp new/kolourpaint-4.13.1/mainWindow/kpMainWindow.cpp --- old/kolourpaint-4.13.0/mainWindow/kpMainWindow.cpp 2013-11-29 15:28:41.000000000 +0100 +++ new/kolourpaint-4.13.1/mainWindow/kpMainWindow.cpp 2014-05-04 19:02:28.000000000 +0200 @@ -611,9 +611,7 @@ // private void kpMainWindow::setDocument (kpDocument *newDoc) { -#if DEBUG_KP_MAIN_WINDOW - kDebug () << "kpMainWindow::setDocument (" << newDoc << ")"; -#endif + //kDebug () << newDoc; // is it a close operation? if (!newDoc) @@ -648,17 +646,9 @@ enableDocumentActions (false); } -#if DEBUG_KP_MAIN_WINDOW - kDebug () << "\tdestroying views"; -#endif - delete d->mainView; d->mainView = 0; slotDestroyThumbnail (); -#if DEBUG_KP_MAIN_WINDOW - kDebug () << "\tdestroying viewManager"; -#endif - // viewManager will die and so will the selection d->actionCopy->setEnabled (false); d->actionCut->setEnabled (false); @@ -695,22 +685,16 @@ #endif d->document->setEnviron (documentEnvironment ()); - #if DEBUG_KP_MAIN_WINDOW - kDebug () <<"\tcreating viewManager"; - #endif d->viewManager = new kpViewManager (this); - #if DEBUG_KP_MAIN_WINDOW - kDebug () << "\tcreating views"; - #endif d->mainView = new kpZoomedView (d->document, d->toolToolBar, d->viewManager, 0/*buddyView*/, d->scrollView, d->scrollView->viewport ()); d->mainView->setObjectName ( QLatin1String("mainView" )); - d->scrollView->setView (d->mainView); d->viewManager->registerView (d->mainView); + d->scrollView->setView (d->mainView); d->mainView->show (); #if DEBUG_KP_MAIN_WINDOW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.13.0/pixmapfx/kpPixmapFX_DrawShapes.cpp new/kolourpaint-4.13.1/pixmapfx/kpPixmapFX_DrawShapes.cpp --- old/kolourpaint-4.13.0/pixmapfx/kpPixmapFX_DrawShapes.cpp 2013-11-29 15:28:41.000000000 +0100 +++ new/kolourpaint-4.13.1/pixmapfx/kpPixmapFX_DrawShapes.cpp 2014-05-04 19:02:28.000000000 +0200 @@ -408,7 +408,10 @@ static void DrawRectHelper (QPainter *p, int x, int y, int width, int height) { - p->drawRect (x, y, width, height); + // workaround for QTBUG-38617 + QPainterPath path; + path.addRect(x, y, width, height); + p->drawPath(path); } //--------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.13.0/views/kpView_Selections.cpp new/kolourpaint-4.13.1/views/kpView_Selections.cpp --- old/kolourpaint-4.13.0/views/kpView_Selections.cpp 2013-11-29 15:28:41.000000000 +0100 +++ new/kolourpaint-4.13.1/views/kpView_Selections.cpp 2014-05-04 19:02:28.000000000 +0200 @@ -110,6 +110,7 @@ viewPointRelSel.y () >= selViewRect.height () - atomicSize); } +//--------------------------------------------------------------------- // protected bool kpView::selectionLargeEnoughToHaveResizeHandlesIfAtomicSize (int atomicSize) const @@ -123,6 +124,8 @@ selViewRect.height () >= atomicSize * 5); } +//--------------------------------------------------------------------- + // public int kpView::selectionResizeHandleAtomicSize () const { @@ -136,17 +139,19 @@ return atomicSize; } +//--------------------------------------------------------------------- + // public bool kpView::selectionLargeEnoughToHaveResizeHandles () const { return (selectionResizeHandleAtomicSize () > 0); } +//--------------------------------------------------------------------- + // public QRegion kpView::selectionResizeHandlesViewRegion (bool forRenderer) const { - QRegion ret; - const int atomicLength = selectionResizeHandleAtomicSize (); if (atomicLength <= 0) return QRegion (); @@ -187,37 +192,38 @@ const QRect selViewRect = selectionViewRect (); + QRegion ret; -#define ADD_BOX_RELATIVE_TO_SELECTION(type,x,y) \ - ret += QRect ((x), (y), type##AtomicLength, type##AtomicLength) - - ADD_BOX_RELATIVE_TO_SELECTION (normal, - selViewRect.width () - normalAtomicLength, - selViewRect.height () - normalAtomicLength); - ADD_BOX_RELATIVE_TO_SELECTION (normal, - selViewRect.width () - normalAtomicLength, - 0); - ADD_BOX_RELATIVE_TO_SELECTION (normal, - 0, - selViewRect.height () - normalAtomicLength); - ADD_BOX_RELATIVE_TO_SELECTION (normal, - 0, - 0); - - ADD_BOX_RELATIVE_TO_SELECTION (vertEdge, - selViewRect.width () - vertEdgeAtomicLength, - (selViewRect.height () - vertEdgeAtomicLength) / 2); - ADD_BOX_RELATIVE_TO_SELECTION (normal, - (selViewRect.width () - normalAtomicLength) / 2, - selViewRect.height () - normalAtomicLength); - ADD_BOX_RELATIVE_TO_SELECTION (normal, - (selViewRect.width () - normalAtomicLength) / 2, - 0); - ADD_BOX_RELATIVE_TO_SELECTION (vertEdge, - 0, - (selViewRect.height () - vertEdgeAtomicLength) / 2); + // top left + ret += QRect(0, 0, normalAtomicLength, normalAtomicLength); -#undef ADD_BOX_RELATIVE_TO_SELECTION + // top middle + ret += QRect((selViewRect.width() - normalAtomicLength) / 2, 0, + normalAtomicLength, normalAtomicLength); + + // top right + ret += QRect(selViewRect.width() - normalAtomicLength - 1, 0, + normalAtomicLength, normalAtomicLength); + + // left middle + ret += QRect(0, (selViewRect.height() - vertEdgeAtomicLength) / 2, + vertEdgeAtomicLength, vertEdgeAtomicLength); + + // right middle + ret += QRect(selViewRect.width() - vertEdgeAtomicLength - 1, (selViewRect.height() - vertEdgeAtomicLength) / 2, + vertEdgeAtomicLength, vertEdgeAtomicLength); + + // bottom left + ret += QRect(0, selViewRect.height() - normalAtomicLength - 1, + normalAtomicLength, normalAtomicLength); + + // bottom middle + ret += QRect((selViewRect.width() - normalAtomicLength) / 2, selViewRect.height() - normalAtomicLength - 1, + normalAtomicLength, normalAtomicLength); + + // bottom right + ret += QRect(selViewRect.width() - normalAtomicLength - 1, selViewRect.height() - normalAtomicLength - 1, + normalAtomicLength, normalAtomicLength); ret.translate (selViewRect.x (), selViewRect.y ()); ret = ret.intersect (selViewRect); @@ -225,6 +231,8 @@ return ret; } +//--------------------------------------------------------------------- + // public // REFACTOR: use QFlags as the return type for better type safety. int kpView::mouseOnSelectionResizeHandle (const QPoint &viewPoint) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kolourpaint-4.13.0/widgets/toolbars/kpToolToolBar.cpp new/kolourpaint-4.13.1/widgets/toolbars/kpToolToolBar.cpp --- old/kolourpaint-4.13.0/widgets/toolbars/kpToolToolBar.cpp 2013-11-29 15:28:41.000000000 +0100 +++ new/kolourpaint-4.13.1/widgets/toolbars/kpToolToolBar.cpp 2014-05-04 19:02:28.000000000 +0200 @@ -328,6 +328,8 @@ } emit sigToolSelected (m_currentTool); + m_baseLayout->activate(); + adjustSizeConstraint(); } //--------------------------------------------------------------------- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org