diff --git a/resources/css/style.css b/resources/css/style.css index 531a582..bcd35df 100644 --- a/resources/css/style.css +++ b/resources/css/style.css @@ -30,6 +30,19 @@ QToolButton { border: none; } +SearchBar { + background-color: white; + background-image: url(":/icons/search.svg"); + background-repeat: no-repeat; + padding: 2px 2px 2px 40px; + max-height: 40px; + margin: 5px; + color: #666; + font-size: 16px; + border: 2px solid #ccc; + border-radius: 5px; +} + /* ----------------------------------------- TabWidget */ diff --git a/resources/icons/search.svg b/resources/icons/search.svg index 6f6ad96..4de676a 100755 --- a/resources/icons/search.svg +++ b/resources/icons/search.svg @@ -1 +1,77 @@ -icon / search \ No newline at end of file + + + + + + image/svg+xml + + icon / search + + + + + + + + + icon / search + + diff --git a/src/searchbar.cpp b/src/searchbar.cpp index 33b7006..1a37441 100644 --- a/src/searchbar.cpp +++ b/src/searchbar.cpp @@ -7,12 +7,9 @@ SearchBar::SearchBar(QWidget *parent) : QLineEdit(parent), - m_completer(&m_completionModel, this), - m_icon(":icons/search.svg") + m_completer(&m_completionModel, this) { - setTextMargins(37, 1, 1, 1); setPlaceholderText("Search"); - setClearButtonEnabled(true); m_completer.setCompletionMode(QCompleter::UnfilteredPopupCompletion); setCompleter(&m_completer); connect(this, &QLineEdit::textEdited, this, &SearchBar::updateCompletion); @@ -25,14 +22,6 @@ SearchBar::SearchBar(QWidget *parent) : #endif } -void SearchBar::paintEvent(QPaintEvent *event) -{ - QLineEdit::paintEvent(event); - QPainter painter(this); - QPixmap pxm = m_icon.pixmap(height() - 6, height() - 6); - painter.drawPixmap(3, 3, pxm); -} - void SearchBar::updateCompletion(const QString &text) { QStringList wordList; diff --git a/src/searchbar.h b/src/searchbar.h index 717c870..b9bf11a 100644 --- a/src/searchbar.h +++ b/src/searchbar.h @@ -12,15 +12,11 @@ class SearchBar : public QLineEdit public: SearchBar(QWidget *parent = nullptr); -protected: - virtual void paintEvent(QPaintEvent *event); - private: QStringListModel m_completionModel; QCompleter m_completer; std::vector m_urlList; QString m_currentHost; - QIcon m_icon; private slots: void updateCompletion(const QString& text);