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

List:       kde-commits
Subject:    kdeextragear-2/kmplayer
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2005-04-01 20:50:05
Message-ID: 20050401205005.161F1490 () office ! kde ! org
[Download RAW message or body]

CVS commit by vriezen: 

Extending test tests/img_scale.smil and fixed bug w/ 'fill="hidden"'


  M +2 -7      src/kmplayer_smil.cpp   1.55
  M +17 -1     tests/img_scale.smil   1.2


--- kdeextragear-2/kmplayer/src/kmplayer_smil.cpp  #1.54:1.55
@@ -591,5 +591,4 @@ KDE_NO_EXPORT void TimedRuntime::stopped
     } else if (element->state == Element::state_started) {
         element->stop ();
-    kdDebug () << "TimedRuntime::processEvent emit elementStopped " << (element ? \
element->nodeName() : "-") << endl;   emit elementStopped ();
     }
@@ -1715,10 +1714,6 @@ KDE_NO_EXPORT void ImageData::paint (QPa
         int w = r->w, h = r->h;
         if (fit == fit_hidden) {
-            int pw = int (d->image->width () * r->xscale);
-            int ph = int (d->image->height () * r->yscale);
-            if (pw < w)
-                w = pw;
-            if (ph < h)
-                h = ph;
+            w = int (d->image->width () * r->xscale);
+            h = int (d->image->height () * r->yscale);
         } else if (fit == fit_meet) { // scale in region, keeping aspects
             if (h > 0 && d->image->height () > 0) {

--- kdeextragear-2/kmplayer/tests/img_scale.smil  #1.1:1.2
@@ -10,9 +10,25 @@
   </head>
   <body>
-    <par dur="10">
+    <par dur="25">
       <img src="../icons/hi128-app-kmplayer.png" region="reg_img1" fit="fill" \
                fill="freeze"/>
       <img src="../icons/hi128-app-kmplayer.png" region="reg_img2" fit="hidden" \
                fill="freeze"/>
       <img src="../icons/hi128-app-kmplayer.png" region="reg_img3" fit="meet" \
                fill="freeze"/>
       <img src="../icons/hi128-app-kmplayer.png" region="reg_img4" fit="slice" \
fill="freeze"/> +      <set targetElement="reg_img1" attributeName="width" to="75" \
begin="5s"/> +      <set targetElement="reg_img2" attributeName="width" to="75" \
begin="5s"/> +      <set targetElement="reg_img3" attributeName="width" to="75" \
begin="5s"/> +      <set targetElement="reg_img4" attributeName="width" to="75" \
begin="5s"/> +      <set targetElement="reg_img1" attributeName="height" to="75" \
begin="10s"/> +      <set targetElement="reg_img2" attributeName="height" to="75" \
begin="10s"/> +      <set targetElement="reg_img3" attributeName="height" to="75" \
begin="10s"/> +      <set targetElement="reg_img4" attributeName="height" to="75" \
begin="10s"/> +      <set targetElement="reg_img1" attributeName="width" to="150" \
begin="15s"/> +      <set targetElement="reg_img2" attributeName="width" to="150" \
begin="15s"/> +      <set targetElement="reg_img3" attributeName="width" to="150" \
begin="15s"/> +      <set targetElement="reg_img4" attributeName="width" to="150" \
begin="15s"/> +      <set targetElement="reg_img1" attributeName="height" to="210" \
begin="20s"/> +      <set targetElement="reg_img2" attributeName="height" to="210" \
begin="20s"/> +      <set targetElement="reg_img3" attributeName="height" to="210" \
begin="20s"/> +      <set targetElement="reg_img4" attributeName="height" to="210" \
begin="20s"/>  </par>
   </body>


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

Configure | About | News | Add a list | Sponsored by KoreLogic