Show
Ignore:
Timestamp:
01/24/08 21:40:25 (10 months ago)
Author:
eugene
Message:

Major docking fix.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/qt-gui_qt4/src/dockicons/dockiconwidget.h

    r5837 r6058  
    2424#include <QWidget> 
    2525 
     26class QMenu; 
     27 
    2628namespace LicqQtGui 
    2729{ 
    28 class DockIcon; 
    29  
    3030/** 
    3131 * Icon widget used by some dock icons 
     
    3939   * Constructor 
    4040   * 
    41    * @param pix Initial icon image 
    42    * @param parent Parent widget 
     41   * @param menu Menu to popup 
    4342   */ 
    44   DockIconWidget(QPixmap* pix, DockIcon* parent); 
     43  DockIconWidget(QMenu* menu); 
    4544 
    4645  /** 
     
    5049 
    5150  /** 
    52    * Set icon image 
     51   * Set the new face icon 
    5352   * 
    54    * @param pix Icon image 
     53   * @param newFace Icon image 
     54   * @param updateMask Should mask be updated from the @a newFace 
    5555   */ 
    56   void Set(QPixmap* pix); 
     56  void setFace(QPixmap* newFace, bool updateMask = true); 
    5757 
    5858  /** 
    59    * Draw the current icon image 
    60    * 
    61    * @param painter Painter to draw with 
     59   * Returns a copy of the current face 
    6260   */ 
    63   void drawIcon(QPainter& painter); 
     61  QPixmap* face(); 
    6462 
    65   QPixmap* vis; 
     63signals: 
     64  /** 
     65   * User has clicked on dock icon 
     66   */ 
     67  void clicked();  
     68   
     69  /** 
     70   * User has middle clicked on dock icon 
     71   */ 
     72  void middleClicked(); 
    6673 
    6774private: 
     75  /** 
     76   * Intercept close attempts 
     77   * 
     78   * @param event Close event 
     79   */ 
     80  virtual void closeEvent(QCloseEvent* event); 
     81 
    6882  /** 
    6983   * User has clicked on icon 
     
    7993   */ 
    8094  virtual void paintEvent(QPaintEvent* event); 
     95 
     96  QMenu* myMenu; 
     97  QPixmap* myFace; 
     98  WId myHandler; 
    8199}; 
    82100