Changeset 6058 for branches/qt-gui_qt4/src/dockicons/defaultdockicon.cpp

Timestamp:

01/24/08 21:40:25 (10 months ago)

Author:

eugene

Message:

Major docking fix.

Files:

• branches/qt-gui_qt4/src/dockicons/defaultdockicon.cpp (modified) (3 diffs)

branches/qt-gui_qt4/src/dockicons/defaultdockicon.cpp

@@ -48 +48 @@
 
 DefaultDockIcon::DefaultDockIcon(QMenu* menu)
-  : DockIcon(menu)
+  : DockIcon()
 {
+  myIcon = new DockIconWidget(menu);
+  relayDockIconSignals();
   updateConfig();
-}
-
-DefaultDockIcon::~DefaultDockIcon()
-{
-  delete pix;
 }
 
@@ -62 +59 @@
   myFortyEight = Config::General::instance()->defaultIconFortyEight();
 
-  delete myIcon;
+  QPixmap* pic = new QPixmap(myFortyEight ? back48_xpm : back64_xpm);
+  QBitmap bmp = QBitmap(myFortyEight ? mask48_xpm : mask64_xpm);
+  pic->setMask(bmp);
+  myIcon->setFace(pic);
+  delete pic;
 
-  if (myFortyEight)
-  {
-    pix = new QPixmap(back48_xpm);
-    QBitmap b;
-    b = QPixmap(mask48_xpm);
-    pix->setMask(b);
-    myIcon = new DockIconWidget(pix, this);
-  }
-  else
-  {
-    pix = new QPixmap(back64_xpm);
-    QBitmap b;
-    b = QPixmap(mask64_xpm);
-    pix->setMask(b);
-    myIcon = new DockIconWidget(pix, this);
-  }
-  X11Init();
+  updateStatusIcon();
+  updateIconMessages(myNewMsg, mySysMsg);
 }
 
@@ -87 +73 @@
   DockIcon::updateStatusIcon();
 
+  if (!myFortyEight && myNewMsg == 0 && mySysMsg == 0)
+    drawIcon64(myStatusIcon);
+
   QPixmap m;
-  switch (myStatus)
-  {
-    case ICQ_STATUS_ONLINE: m = QPixmap(online_xpm); break;
-    case ICQ_STATUS_AWAY: m = QPixmap(away_xpm); break;
-    case ICQ_STATUS_NA: m = QPixmap(na_xpm); break;
-    case ICQ_STATUS_OCCUPIED: m = QPixmap(occupied_xpm); break;
-    case ICQ_STATUS_DND: m = QPixmap(dnd_xpm); break;
-    case ICQ_STATUS_FREEFORCHAT: m = QPixmap(ffc_xpm); break;
-    case ICQ_STATUS_OFFLINE: m = QPixmap(offline_xpm); break;
-  }
   if (myInvisible)
     m = QPixmap(invisible_xpm);
+  else
+    switch (myStatus)
+    {
+      case ICQ_STATUS_ONLINE: m = QPixmap(online_xpm); break;
+      case ICQ_STATUS_AWAY: m = QPixmap(away_xpm); break;
+      case ICQ_STATUS_NA: m = QPixmap(na_xpm); break;
+      case ICQ_STATUS_OCCUPIED: m = QPixmap(occupied_xpm); break;
+      case ICQ_STATUS_DND: m = QPixmap(dnd_xpm); break;
+      case ICQ_STATUS_FREEFORCHAT: m = QPixmap(ffc_xpm); break;
+      case ICQ_STATUS_OFFLINE: m = QPixmap(offline_xpm); break;
+    }
 
-  QPainter painter(myIcon->vis);
-  if (!myFortyEight)
-  {
-    painter.drawPixmap(0, 44, m);
-    // Draw the little icon if no new messages
-    if (myNewMsg == 0 && mySysMsg == 0)
-    {
-      QPixmap* p = &myStatusIcon;
-      painter.fillRect(31, 6, 27, 16, QColor(0,0,0));
-      if (p != NULL)
-      {
-        int w = p->width() > 27 ? 27 : p->width();
-        int h = p->height() > 16 ? 16 : p->height();
-        int x = 45 - (w / 2);
-        int y = 14 - (h / 2);
-        painter.drawPixmap(x, y, *p, 0, 0, w, h);
-      }
-    }
-  }
-  else
-    painter.drawPixmap(0, 27, m);
+  QPixmap* face = myIcon->face();
+  QPainter painter(face);
+  painter.drawPixmap(0, myFortyEight ? 27 : 44, m);
   painter.end();
 
-  myIcon->repaint();
-  repaint();
-}
-
-void DefaultDockIcon::splitDigits(int num, int& low, int &high)
-{
-  if (num > 99)
-  {
-    low = 9;
-    high = 9;
-  }
-  else
-  {
-    low = num % 10;
-    high = num / 10;
-  }
+  myIcon->setFace(face);
+  delete face;
 }
 
 void DefaultDockIcon::updateIconMessages(int newMsg, int sysMsg)
 {
-  QPainter p(myIcon->vis);
-  int d1, d10;
+  DockIcon::updateIconMessages(newMsg, sysMsg);
 
-  // set the new msg digits
-  splitDigits(newMsg, d1, d10);
+  int low, high;
 
-  if (!myFortyEight)
-  {
-    p.drawPixmap(44, 26, digits[d10]);
-    p.drawPixmap(50, 26, digits[d1]);
-  }
-  else
-  {
-    p.drawPixmap(44, 9, digits[d10]);
-    p.drawPixmap(50, 9, digits[d1]);
-  }
+#define SPLIT(num) \
+  (num) = qMin(num, 99); \
+  low = (num) % 10; \
+  high = (num) / 10;
 
-  // set the system msg digits
-  splitDigits(sysMsg, d1, d10);
+  QPixmap* face = myIcon->face();
+  QPainter p(face);
 
-  if (!myFortyEight)
-  {
-    p.drawPixmap(44, 38, digits[d10]);
-    p.drawPixmap(50, 38, digits[d1]);
-  }
-  else
-  {
-    p.drawPixmap(44, 21, digits[d10]);
-    p.drawPixmap(50, 21, digits[d1]);
-  }
+  SPLIT(newMsg);
+  p.drawPixmap(44, myFortyEight ? 8 : 26, digits[high]);
+  p.drawPixmap(50, myFortyEight ? 8 : 26, digits[low]);
+
+  SPLIT(sysMsg);
+  p.drawPixmap(44, myFortyEight ? 20 : 38, digits[high]);
+  p.drawPixmap(50, myFortyEight ? 20 : 38, digits[low]);
+
   p.end();
 
-  // Base class will trigger updateEventIcon to actually paint the icon
-  DockIcon::updateIconMessages(newMsg, sysMsg);
+  myIcon->setFace(face);
+  delete face;
 }
 
 void DefaultDockIcon::updateEventIcon()
 {
-  if (!myFortyEight)
-  {
-    QPainter p(myIcon->vis);
+  DockIcon::updateEventIcon();
 
-    // Draw the little icon now
-    QPixmap* m = NULL;
-    if (mySysMsg > 0 || myNewMsg > 0)
-      m = &myEventIcon;
-    else
-      m = &myStatusIcon;
-    p.fillRect(31, 6, 27, 16, QColor(0,0,0));
-    if (m != NULL)
-    {
-      int w = m->width() > 27 ? 27 : m->width();
-      int h = m->height() > 16 ? 16 : m->height();
-      int x = 45 - (w / 2);
-      int y = 14 - (h / 2);
-      p.drawPixmap(x, y, *m, 0, 0, w, h);
-    }
+  if (myFortyEight)
+    return;
 
-    p.end();
-  }
+  drawIcon64((mySysMsg > 0 || myNewMsg > 0) ? myEventIcon : myStatusIcon);
+}
 
-  myIcon->repaint();
-  repaint();
+void DefaultDockIcon::drawIcon64(QPixmap* icon)
+{
+  if (icon == NULL || icon->isNull())
+    return;
+
+  QPixmap* face = myIcon->face();
+  QPainter p(face);
+
+  // Clear the icon area
+  p.fillRect(31, 6, 27, 16, Qt::black);
+
+  // Calculate drawing coordinates
+  int w = qMin(icon->width(), 27);
+  int h = qMin(icon->height(), 16);
+  int x = 45 - (w / 2);
+  int y = 14 - (h / 2);
+
+  p.drawPixmap(x, y, *icon, 0, 0, w, h);
+  p.end();
+
+  myIcon->setFace(face);
+  delete face;
 }