浏览代码

Removed QIcon::Mode property.

QIcon::Mode is not declared with Q_ENUMS(...) so it cannot be used
as a property type. Also removed the special icon mode handling for
the clear icon. Users of the widget should set the desired QIcon
containing the different modes themselves.
Sascha Zelzer 13 年之前
父节点
当前提交
3c62ee366a
共有 2 个文件被更改,包括 1 次插入23 次删除
  1. 1 18
      Libs/Widgets/ctkSearchBox.cpp
  2. 0 5
      Libs/Widgets/ctkSearchBox.h

+ 1 - 18
Libs/Widgets/ctkSearchBox.cpp

@@ -51,7 +51,6 @@ public:
   bool alwaysShowClearIcon;
   bool hideClearIcon;
 
-  QIcon::Mode clearIconMode;
 #if QT_VERSION < 0x040700
   QString placeholderText;
 #endif
@@ -63,7 +62,6 @@ ctkSearchBoxPrivate::ctkSearchBoxPrivate(ctkSearchBox &object)
 {
   this->clearIcon = QIcon(":Icons/clear.svg");
   this->searchIcon = QIcon(":Icons/search.svg");
-  this->clearIconMode = QIcon::Disabled;
   this->showSearchIcon = false;
   this->alwaysShowClearIcon = false;
   this->hideClearIcon = true;
@@ -211,21 +209,6 @@ QIcon ctkSearchBox::clearIcon()const
 }
 
 // --------------------------------------------------
-void ctkSearchBox::setClearIconMode(QIcon::Mode mode)
-{
-  Q_D(ctkSearchBox);
-  d->clearIconMode = mode;
-  this->update();
-}
-
-// --------------------------------------------------
-QIcon::Mode ctkSearchBox::clearIconMode()const
-{
-  Q_D(const ctkSearchBox);
-  return d->clearIconMode;
-}
-
-// --------------------------------------------------
 void ctkSearchBox::paintEvent(QPaintEvent * event)
 {
   Q_D(ctkSearchBox);
@@ -296,7 +279,7 @@ void ctkSearchBox::paintEvent(QPaintEvent * event)
   // Draw clearIcon
   if (!d->hideClearIcon)
     {
-    QPixmap closePixmap = d->clearIcon.pixmap(cRect.size(),this->isEnabled() ? d->clearIconMode : QIcon::Disabled);
+    QPixmap closePixmap = d->clearIcon.pixmap(cRect.size(),this->isEnabled() ? QIcon::Normal : QIcon::Disabled);
     this->style()->drawItemPixmap(&p, cRect, Qt::AlignCenter, closePixmap);
     }
 

+ 0 - 5
Libs/Widgets/ctkSearchBox.h

@@ -57,8 +57,6 @@ class CTK_WIDGETS_EXPORT ctkSearchBox : public QLineEdit
   Q_PROPERTY(QIcon searchIcon READ searchIcon WRITE setSearchIcon)
   Q_PROPERTY(QIcon clearIcon READ clearIcon WRITE setClearIcon)
 
-  Q_PROPERTY(QIcon::Mode clearIconMode READ clearIconMode WRITE setClearIconMode)
-
 public:
   /// Superclass typedef
   typedef QLineEdit Superclass;
@@ -83,9 +81,6 @@ public:
   void setClearIcon(const QIcon&);
   QIcon clearIcon()const;
 
-  void setClearIconMode(QIcon::Mode);
-  QIcon::Mode clearIconMode()const;
-
 protected Q_SLOTS:
   /// Change the clear icon's state to enabled or disabled.
   void updateClearButtonState();