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

List:       kde-commits
Subject:    kdeextragear-2/kmplayer/src
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2005-04-01 18:36:12
Message-ID: 20050401183612.86E8E490 () office ! kde ! org
[Download RAW message or body]

CVS commit by vriezen: 

Scale font wrt to xscale of region


  M +6 -2      kmplayer_smil.cpp   1.53


--- kdeextragear-2/kmplayer/src/kmplayer_smil.cpp  #1.52:1.53
@@ -591,4 +591,5 @@ 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 ();
     }
@@ -1802,4 +1803,5 @@ namespace KMPlayer {
             codec = 0L;
             font = QApplication::font ();
+            font_size = font.pointSize ();
             transparent = false;
         }
@@ -1810,4 +1812,5 @@ namespace KMPlayer {
         QTextCodec * codec;
         QFont font;
+        int font_size;
         bool transparent;
     };
@@ -1853,7 +1856,7 @@ QString TextData::setParam (const QStrin
         ; //FIXME
     } else if (name == QString ("fontPtSize")) {
-        d->font.setPointSize (val.toInt ());
+        d->font_size = val.toInt ();
     } else if (name == QString ("fontSize")) {
-        d->font.setPointSize (d->font.pointSize () + val.toInt ());
+        d->font_size += val.toInt ();
     // TODO: expandTabs fontBackgroundColor fontSize fontStyle fontWeight hAlig \
vAlign wordWrap  }
@@ -1869,4 +1872,5 @@ KDE_NO_EXPORT void TextData::paint (QPai
             p.fillRect (x, y, region_node->w, region_node->h,
                     QColor (QRgb (d->background_color)));
+        d->font.setPointSize (int (region_node->xscale * d->font_size));
         QFontMetrics metrics (d->font);
         QPainter::TextDirection direction = QApplication::reverseLayout () ?


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