RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-24 06:25:06 +00:00
Code Issues Activity Actions

Make buttons pressable.

Browse source
This commit is contained in:
Andreas Kling 2018-10-12 15:52:41 +02:00
parent 5412dac05d
commit 0dcdbe3e03
2 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Widgets/Button.cpp
View file

@ -22,6 +22,7 @@ void Button::setCaption(String&& caption)
void Button::onPaint(PaintEvent&) void Button::onPaint(PaintEvent&)
{ {
Color buttonColor(192, 192, 192); Color buttonColor(192, 192, 192);
Color highlightColor(255, 255, 255);
Color shadowColor(96, 96, 96); Color shadowColor(96, 96, 96);
Painter painter(*this); Painter painter(*this);
@ -37,22 +38,35 @@ void Button::onPaint(PaintEvent&)
painter.drawLine({ 0, 1 }, { 0, height() - 2 }, Color(0, 0, 0)); painter.drawLine({ 0, 1 }, { 0, height() - 2 }, Color(0, 0, 0));
painter.drawLine({ width() - 1, 1 }, { width() - 1, height() - 2 }, Color(0, 0, 0)); painter.drawLine({ width() - 1, 1 }, { width() - 1, height() - 2 }, Color(0, 0, 0));
// White highlight if (m_beingPressed) {
painter.drawLine({ 1, 1 }, { width() - 2, 1 }, Color(255, 255, 255)); // Base
painter.drawLine({ 1, 2 }, { width() - 3, 2 }, Color(255, 255, 255)); painter.fillRect({ 1, 1, width() - 2, height() - 2 }, buttonColor);
painter.drawLine({ 1, 3 }, { 1, height() - 2 }, Color(255, 255, 255));
painter.drawLine({ 2, 3 }, { 2, height() - 3 }, Color(255, 255, 255));
// Gray shadow // Sunken shadow
painter.drawLine({ width() - 2, 1 }, { width() - 2, height() - 4 }, shadowColor); painter.drawLine({ 1, 1 }, { width() - 2, 1 }, shadowColor);
painter.drawLine({ width() - 3, 2 }, { width() - 3, height() - 4 }, shadowColor); painter.drawLine({ 1, 2 }, {1, height() - 2 }, shadowColor);
painter.drawLine({ 1, height() - 2 }, { width() - 2, height() - 2 }, shadowColor); } else {
painter.drawLine({ 2, height() - 3 }, { width() - 2, height() - 3 }, shadowColor); // Base
painter.fillRect({ 3, 3, width() - 6, height() - 6 }, buttonColor);
painter.fillRect({ 3, 3, width() - 6, height() - 6 }, buttonColor); // White highlight
painter.drawLine({ 1, 1 }, { width() - 2, 1 }, highlightColor);
painter.drawLine({ 1, 2 }, { width() - 3, 2 }, highlightColor);
painter.drawLine({ 1, 3 }, { 1, height() - 2 }, highlightColor);
painter.drawLine({ 2, 3 }, { 2, height() - 3 }, highlightColor);
// Gray shadow
painter.drawLine({ width() - 2, 1 }, { width() - 2, height() - 4 }, shadowColor);
painter.drawLine({ width() - 3, 2 }, { width() - 3, height() - 4 }, shadowColor);
painter.drawLine({ 1, height() - 2 }, { width() - 2, height() - 2 }, shadowColor);
painter.drawLine({ 2, height() - 3 }, { width() - 2, height() - 3 }, shadowColor);
}
if (!caption().isEmpty()) { if (!caption().isEmpty()) {
painter.drawText(rect(), caption(), Painter::TextAlignment::Center, Color(0, 0, 0)); auto textRect = rect();
if (m_beingPressed)
textRect.moveBy(1, 1);
painter.drawText(textRect, caption(), Painter::TextAlignment::Center, Color(0, 0, 0));
} }
} }
@ -60,8 +74,19 @@ void Button::onMouseDown(MouseEvent& event)
{ {
printf("Button::onMouseDown: x=%d, y=%d, button=%u\n", event.x(), event.y(), (unsigned)event.button()); printf("Button::onMouseDown: x=%d, y=%d, button=%u\n", event.x(), event.y(), (unsigned)event.button());
setBackgroundColor(Color(0xff, 0xc0, 0xc0)); m_beingPressed = true;
update(); update();
Widget::onMouseDown(event); Widget::onMouseDown(event);
} }
void Button::onMouseUp(MouseEvent& event)
{
printf("Button::onMouseUp: x=%d, y=%d, button=%u\n", event.x(), event.y(), (unsigned)event.button());
m_beingPressed = false;
update();
Widget::onMouseUp(event);
}

2
Widgets/Button.h
View file

@ -14,9 +14,11 @@ public:
private: private:
virtual void onPaint(PaintEvent&) override; virtual void onPaint(PaintEvent&) override;
virtual void onMouseDown(MouseEvent&) override; virtual void onMouseDown(MouseEvent&) override;
virtual void onMouseUp(MouseEvent&) override;
virtual const char* className() const override { return "Button"; } virtual const char* className() const override { return "Button"; }
String m_caption; String m_caption;
bool m_beingPressed { false };
}; };