浏览代码

BUG: Fixed duplicate "Search" placeholder text in ctkSearchBox

CTK rendered placeholderText even when built with Qt versions >= 4.7, while in these Qt versions Qt rendered placeholder text already.
On hi-DPI screens with Qt5, Qt rendered placeholderText in a slightly shifted position, which made duplicate rendering of the placeholderText by CTK and Qt very visible.

Fixed it by correcting the Qt version check (CTK paints placeholderText only when Qt version < 4.7).
Andras Lasso 7 年之前
父节点
当前提交
c78828ea4f
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      Libs/Widgets/ctkSearchBox.cpp

+ 1 - 5
Libs/Widgets/ctkSearchBox.cpp

@@ -226,15 +226,11 @@ void ctkSearchBox::paintEvent(QPaintEvent * event)
   QRect cRect = d->clearRect();
   QRect sRect = d->showSearchIcon ? d->searchRect() : QRect();
 
-#if QT_VERSION >= 0x040700
+#if QT_VERSION < 0x040700
   QRect r = rect();
   QPalette pal = palette();
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
   QStyleOptionFrameV2 panel;
-#else
-  QStyleOptionFrame panel;
-#endif
   initStyleOption(&panel);
   r = this->style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
   r.setX(r.x() + this->textMargins().left());