summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-02-22 14:43:17 +0100
committerGitHub <noreply@github.com>2020-02-22 14:43:17 +0100
commitfee00746c8ec0e172abe355a744b7a3575904e13 (patch)
treed5b2c81496df8b1a4beb1dc3d37037980af8dba4 /src
parentMerge pull request #127 from adasauce/cleanup-dark-qss (diff)
parentremove setStyleSheet calls directly from widget code (diff)
downloadnheko-fee00746c8ec0e172abe355a744b7a3575904e13.tar.xz
Merge pull request #128 from adasauce/no-setstylesheet
remove setStyleSheet calls directly from widget code
Diffstat (limited to 'src')
-rw-r--r--src/Splitter.cpp1
-rw-r--r--src/emoji/Category.cpp1
-rw-r--r--src/emoji/Panel.cpp4
-rw-r--r--src/ui/TextField.cpp17
-rw-r--r--src/ui/TextField.h4
5 files changed, 0 insertions, 27 deletions
diff --git a/src/Splitter.cpp b/src/Splitter.cpp

index 6267e591..a2f95ed4 100644 --- a/src/Splitter.cpp +++ b/src/Splitter.cpp
@@ -28,7 +28,6 @@ Splitter::Splitter(QWidget *parent) { connect(this, &QSplitter::splitterMoved, this, &Splitter::onSplitterMoved); setChildrenCollapsible(false); - setStyleSheet("QSplitter::handle { image: none; }"); } void diff --git a/src/emoji/Category.cpp b/src/emoji/Category.cpp
index 659555f7..e674e9db 100644 --- a/src/emoji/Category.cpp +++ b/src/emoji/Category.cpp
@@ -75,7 +75,6 @@ Category::Category(QString category, std::vector<Emoji> emoji, QWidget *parent) category_ = new QLabel(category, this); category_->setFont(font); - category_->setStyleSheet("margin: 20px 0 20px 8px;"); mainLayout_->addWidget(category_); mainLayout_->addWidget(emojiListView_); diff --git a/src/emoji/Panel.cpp b/src/emoji/Panel.cpp
index e3b966b4..f0e4449d 100644 --- a/src/emoji/Panel.cpp +++ b/src/emoji/Panel.cpp
@@ -35,10 +35,6 @@ Panel::Panel(QWidget *parent) , height_{350} , categoryIconSize_{20} { - setStyleSheet("QWidget {border: none;}" - "QScrollBar:vertical { width: 0px; margin: 0px; }" - "QScrollBar::handle:vertical { min-height: 30px; }"); - setAttribute(Qt::WA_ShowWithoutActivating, true); setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint); diff --git a/src/ui/TextField.cpp b/src/ui/TextField.cpp
index 6c1552a8..4bb7596a 100644 --- a/src/ui/TextField.cpp +++ b/src/ui/TextField.cpp
@@ -103,23 +103,6 @@ TextField::label() const } void -TextField::setTextColor(const QColor &color) -{ - text_color_ = color; - setStyleSheet(QString("QLineEdit { color: %1; }").arg(color.name())); -} - -QColor -TextField::textColor() const -{ - if (!text_color_.isValid()) { - return QPalette().color(QPalette::Text); - } - - return text_color_; -} - -void TextField::setLabelColor(const QColor &color) { label_color_ = color; diff --git a/src/ui/TextField.h b/src/ui/TextField.h
index 100fed31..85d5036d 100644 --- a/src/ui/TextField.h +++ b/src/ui/TextField.h
@@ -15,7 +15,6 @@ class TextField : public QLineEdit { Q_OBJECT - Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor) Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor) Q_PROPERTY(QColor labelColor WRITE setLabelColor READ labelColor) Q_PROPERTY(QColor underlineColor WRITE setUnderlineColor READ underlineColor) @@ -30,12 +29,10 @@ public: void setLabelColor(const QColor &color); void setLabelFontSize(qreal size); void setShowLabel(bool value); - void setTextColor(const QColor &color); void setUnderlineColor(const QColor &color); QColor inkColor() const; QColor labelColor() const; - QColor textColor() const; QColor underlineColor() const; QColor backgroundColor() const; QString label() const; @@ -52,7 +49,6 @@ private: QColor ink_color_; QColor background_color_; QColor label_color_; - QColor text_color_; QColor underline_color_; QString label_text_; TextFieldLabel *label_;