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

List:       koffice
Subject:    Re: A bug fixed patch of KPresenter.
From:       Toshitaka Fujioka <tositaka () soft ! kusa ! ac ! jp>
Date:       2001-01-26 10:04:41
[Download RAW message or body]

Hello.

Werner Trobin wrote:

> David Faure wrote:
> 
>> 
>> But I don't like the patch in itself.
>> Adding a QPen to each KPObject seems overkill.
>> Isn't there another way to do the same thing, without adding a QPen
>> to each KPObject ? (I don't know that code too well).
> 
> 
> I already added it to my TODO list (the KPresenter entries
> seem to grow exponentially :} ) but I didn't find the time
> yet as I'm preparing for an exam. Sorry, will fix it as soon
> as I find the time.
> 
> If anyone finds another solution, please go ahead.

I remade a patch.
I used "bool" not use "QPen".
This patch does action same as last patch.

I attached a patch.
Please try to use.


["koffice-kpresenter-bugfix-20010126.diff" (text/plain)]

diff -ur koffice.org/kpresenter/kpobject.cc koffice/kpresenter/kpobject.cc
--- koffice.org/kpresenter/kpobject.cc	Fri Jan 26 18:34:31 2001
+++ koffice/kpresenter/kpobject.cc	Fri Jan 26 18:37:00 2001
@@ -369,7 +369,12 @@
             _painter->setWorldMatrix( m, true );
         }
 
-        _painter->setPen( QPen( Qt::black, 1, Qt::DotLine ) );
+
+        if ( NoPenJudgment == TRUE )
+            _painter->setPen( QPen( Qt::black, 1, Qt::DotLine ) );
+        else
+            _painter->setPen( Qt::NoPen );
+
         _painter->setBrush( Qt::NoBrush );
         _painter->drawRect( 0, 0, ext.width(), ext.height() );
 
diff -ur koffice.org/kpresenter/kpobject.h koffice/kpresenter/kpobject.h
--- koffice.org/kpresenter/kpobject.h	Fri Jan 26 18:34:31 2001
+++ koffice/kpresenter/kpobject.h	Fri Jan 26 18:37:45 2001
@@ -202,6 +202,8 @@
 
     DCOPObject *dcop;
 
+    bool NoPenJudgment;
+
 };
 
 #endif
diff -ur koffice.org/kpresenter/kptextobject.cc koffice/kpresenter/kptextobject.cc
--- koffice.org/kpresenter/kptextobject.cc	Fri Jan 26 18:34:32 2001
+++ koffice/kpresenter/kptextobject.cc	Fri Jan 26 18:44:25 2001
@@ -456,6 +456,11 @@
         else
             _painter->drawPixmap( penw, penw, *gradient->getGradient(), 0, 0, ow - 2 \
* penw, oh - 2 * penw );  
+        if ( pen.style() == Qt::NoPen )
+            NoPenJudgment = TRUE;
+        else
+            NoPenJudgment = FALSE;
+
         _painter->setPen( pen );
         _painter->setBrush( Qt::NoBrush );
         _painter->drawRect( penw, penw, ow - 2 * penw, oh - 2 * penw );



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