d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add style colors for the ScrollBar

Browse source
This commit is contained in:
Konstantinos Sideris 2017-12-05 14:13:26 +02:00
parent d6e6ec2581
commit 6415c4125f
5 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/ui/ScrollBar.h
View file

@ -26,12 +26,21 @@
class ScrollBar : public QScrollBar class ScrollBar : public QScrollBar
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
Q_PROPERTY(QColor handleColor READ handleColor WRITE setHandleColor)
public: public:
ScrollBar(QScrollArea *area, QWidget *parent = nullptr); ScrollBar(QScrollArea *area, QWidget *parent = nullptr);
void fadeIn(); void fadeIn();
void fadeOut(); void fadeOut();
QColor backgroundColor() const { return bgColor_; }
void setBackgroundColor(QColor &color) { bgColor_ = color; }
QColor handleColor() const { return handleColor_; }
void setHandleColor(QColor &color) { handleColor_ = color; }
protected: protected:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
void sliderChange(SliderChange change) override; void sliderChange(SliderChange change) override;
@ -50,4 +59,7 @@ private:
QScrollArea *area_; QScrollArea *area_;
QRect handle_; QRect handle_;
QColor bgColor_ = QColor(33, 33, 33, 30);
QColor handleColor_ = QColor(0, 0, 0, 80);
}; };

5
resources/styles/nheko-dark.qss
View file

@ -117,3 +117,8 @@ QTextEdit {
background-color: #383c4a; background-color: #383c4a;
color: #caccd1; color: #caccd1;
} }
ScrollBar {
qproperty-handleColor: #caccd1;
qproperty-backgroundColor: #383c4e;
}

5
resources/styles/nheko.qss
View file

@ -108,3 +108,8 @@ FloatingButton {
qproperty-backgroundColor: #efefef; qproperty-backgroundColor: #efefef;
qproperty-foregroundColor: black; qproperty-foregroundColor: black;
} }
ScrollBar {
qproperty-handleColor: #ccc;
qproperty-backgroundColor: #efefef;
}

5
resources/styles/system.qss
View file

@ -84,3 +84,8 @@ QTextEdit,
QLineEdit { QLineEdit {
background-color: palette(window); background-color: palette(window);
} }
ScrollBar {
qproperty-handleColor: palette(text);
qproperty-backgroundColor: palette(window);
}

7
src/ui/ScrollBar.cc
View file

@ -85,10 +85,7 @@ ScrollBar::paintEvent(QPaintEvent *)
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
QColor bg(33, 33, 33, 30); p.setBrush(backgroundColor());
QColor handle(0, 0, 0, 80);
p.setBrush(bg);
QRect backgroundArea(Padding, 0, handleWidth_, height()); QRect backgroundArea(Padding, 0, handleWidth_, height());
p.drawRoundedRect(backgroundArea, roundRadius_, roundRadius_); p.drawRoundedRect(backgroundArea, roundRadius_, roundRadius_);
@ -104,7 +101,7 @@ ScrollBar::paintEvent(QPaintEvent *)
int handle_y = (value() * (areaHeight - handleHeight - roundRadius_ / 2)) / maximum(); int handle_y = (value() * (areaHeight - handleHeight - roundRadius_ / 2)) / maximum();
p.setBrush(handle); p.setBrush(handleColor());
QRect handleArea(Padding, handle_y, handleWidth_, handleHeight); QRect handleArea(Padding, handle_y, handleWidth_, handleHeight);
p.drawRoundedRect(handleArea, roundRadius_, roundRadius_); p.drawRoundedRect(handleArea, roundRadius_, roundRadius_);
} }