[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice-devel
Subject:    Revert in KWord
From:       zander () kde ! org
Date:       2010-08-10 14:12:13
Message-ID: 201008101612.14048.zander () kde ! org
[Download RAW message or body]

I just noticed this commit email message;

This revert of my work has not been announced or discussed anywhere, no 
breakges have been reported on bugzilla or anywhere else I could find.

Can we please communicate instead of commit reverts of others work? I think 
this specific request has been made a LOT in the last couple of weeks so this 
revert really surprises me in a bad way :-(

I invite Hanzes to explain the problems he has and work together to resolve 
them.

And let me be crystal clear; in KWord I am the maintainer and I very much 
welcome people working together to fix problems and add features. The way that 
this happens is by talking to me and not working around me. If you try this 
anyway you will notice your fixes no longer are welcome because I value 
cooperation and a friendly atmosphere much more than I value code.

On Tuesday 10. August 2010 14.33.53 Matus Hanzes wrote:
> SVN commit 1161608 by hanzes:
> 
> Revert commit 1158423 because it causes severe regressions for background
> images.  Discussed with ingwa.
> 
>  M  +22 -15    KWFrameLayout.cpp
>  M  +0 -1      KWPageBackground.cpp
> 
> 
> --- trunk/koffice/kword/part/frames/KWFrameLayout.cpp #1161607:1161608
> @@ -66,11 +66,15 @@
>      // create page background
>      KWTextFrameSet *fs = getOrCreate(KWord::PageBackgroundFrameSet, page);
>      if (!hasFrameOn(fs, pageNumber)) {
> +        if (fs->frameCount() == 0) {
>          KoShape *shape = new KWPageBackground();
> -        shape->setSize(QSizeF(page.width(), page.height()));
> -        KWFrame *f = new KWFrame(shape, fs);
> -        f->setTextRunAround(KWord::RunThrough);
> +            shape->setSize(QSize(20, 10));
> +            new KWFrame(shape, fs);
>      }
> +        else {
> +            createCopyFrame(fs, page);
> +        }
> +    }
> 
>      // create headers & footers
>      KWord::TextFrameSetType origin;
> @@ -320,19 +324,22 @@
>          default:;
>          }
>      }
> -    if (minZIndex < INT_MAX) {
> -        --minZIndex;
> -        if (endnote)
> -            endnote->shape()->setZIndex(minZIndex--);
> -        for (int i = 0; i < columns; ++i)
> -            main[i]->shape()->setZIndex(minZIndex);
> -        if (footer)
> -            footer->shape()->setZIndex(--minZIndex);
> -        if (header)
> -            header->shape()->setZIndex(--minZIndex);
> -        if (pageBackground)
> -            pageBackground->shape()->setZIndex(--minZIndex);
> +    for (int i = 0; i < columns; ++i) {
> +        main[i]->shape()->setZIndex(SHRT_MIN + 3);
> +
>      }
> +    if (footer) {
> +        footer->shape()->setZIndex(SHRT_MIN + 2);
> +    }
> +    if (endnote) {
> +        endnote->shape()->setZIndex(SHRT_MIN + 4);
> +    }
> +    if (header) {
> +        header->shape()->setZIndex(SHRT_MIN + 1);
> +    }
> +    if (pageBackground) {
> +        pageBackground->shape()->setZIndex(SHRT_MIN);
> +    }
> 
>      // spread space across items.
>      qreal heightLeft = page.height();
> --- trunk/koffice/kword/part/frames/KWPageBackground.cpp #1161607:1161608
> @@ -32,7 +32,6 @@
> 
>  void KWPageBackground::paint(QPainter &painter, const KoViewConverter
> &converter) {
> -    return;
>      if (background()) {
>          applyConversion(painter, converter);
>          QPainterPath p;

-- 
Thomas Zander
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]