RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:47:34 +00:00
Code Issues Activity Actions

LibGUI: Refine AbstractButton pressing behaviour

Browse source 
Previously the code couldn't handle leaving the AbstractButton through
tab, while having it pressed through space or enter.
This commit is contained in:
FrHun 2021-09-15 17:36:49 +02:00 • committed by Andreas Kling
parent acd44bdcad
commit 34844dd547
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Libraries/LibGUI/AbstractButton.cpp
View file

@ -113,13 +113,14 @@ void AbstractButton::mousedown_event(MouseEvent& event)
click(); click();
m_auto_repeat_timer->start(m_auto_repeat_interval); m_auto_repeat_timer->start(m_auto_repeat_interval);
} }
event.accept();
} }
Widget::mousedown_event(event); Widget::mousedown_event(event);
} }
void AbstractButton::mouseup_event(MouseEvent& event) void AbstractButton::mouseup_event(MouseEvent& event)
{ {
if (event.button() == MouseButton::Left) { if (event.button() == MouseButton::Left && m_being_pressed) {
bool was_auto_repeating = m_auto_repeat_timer->is_active(); bool was_auto_repeating = m_auto_repeat_timer->is_active();
m_auto_repeat_timer->stop(); m_auto_repeat_timer->stop();
bool was_being_pressed = m_being_pressed; bool was_being_pressed = m_being_pressed;
@ -137,21 +138,35 @@ void AbstractButton::enter_event(Core::Event&)
update(); update();
} }
void AbstractButton::leave_event(Core::Event&) void AbstractButton::leave_event(Core::Event& event)
{ {
m_hovered = false; m_hovered = false;
if (m_being_keyboard_pressed)
m_being_keyboard_pressed = m_being_pressed = false;
update(); update();
event.accept();
Widget::leave_event(event);
}
void AbstractButton::focusout_event(GUI::FocusEvent& event)
{
if (m_being_keyboard_pressed) {
m_being_pressed = m_being_keyboard_pressed = false;
event.accept();
update();
}
Widget::focusout_event(event);
} }
void AbstractButton::keydown_event(KeyEvent& event) void AbstractButton::keydown_event(KeyEvent& event)
{ {
if (event.key() == KeyCode::Key_Return || event.key() == KeyCode::Key_Space) { if (event.key() == KeyCode::Key_Return || event.key() == KeyCode::Key_Space) {
m_being_pressed = true; m_being_pressed = m_being_keyboard_pressed = true;
update(); update();
event.accept(); event.accept();
return; return;
} else if (m_being_pressed && event.key() == KeyCode::Key_Escape) { } else if (m_being_pressed && event.key() == KeyCode::Key_Escape) {
m_being_pressed = false; m_being_pressed = m_being_keyboard_pressed = false;
update(); update();
event.accept(); event.accept();
return; return;
@ -162,8 +177,8 @@ void AbstractButton::keydown_event(KeyEvent& event)
void AbstractButton::keyup_event(KeyEvent& event) void AbstractButton::keyup_event(KeyEvent& event)
{ {
bool was_being_pressed = m_being_pressed; bool was_being_pressed = m_being_pressed;
m_being_pressed = false;
if (was_being_pressed && (event.key() == KeyCode::Key_Return || event.key() == KeyCode::Key_Space)) { if (was_being_pressed && (event.key() == KeyCode::Key_Return || event.key() == KeyCode::Key_Space)) {
m_being_pressed = m_being_keyboard_pressed = false;
click(event.modifiers()); click(event.modifiers());
update(); update();
event.accept(); event.accept();

2
Userland/Libraries/LibGUI/AbstractButton.h
View file

@ -50,6 +50,7 @@ protected:
virtual void keyup_event(KeyEvent&) override; virtual void keyup_event(KeyEvent&) override;
virtual void enter_event(Core::Event&) override; virtual void enter_event(Core::Event&) override;
virtual void leave_event(Core::Event&) override; virtual void leave_event(Core::Event&) override;
virtual void focusout_event(GUI::FocusEvent&) override;
virtual void change_event(Event&) override; virtual void change_event(Event&) override;
void paint_text(Painter&, const Gfx::IntRect&, const Gfx::Font&, Gfx::TextAlignment, Gfx::TextWrapping = Gfx::TextWrapping::DontWrap); void paint_text(Painter&, const Gfx::IntRect&, const Gfx::Font&, Gfx::TextAlignment, Gfx::TextWrapping = Gfx::TextWrapping::DontWrap);
@ -60,6 +61,7 @@ private:
bool m_checkable { false }; bool m_checkable { false };
bool m_hovered { false }; bool m_hovered { false };
bool m_being_pressed { false }; bool m_being_pressed { false };
bool m_being_keyboard_pressed { false };
bool m_exclusive { false }; bool m_exclusive { false };
int m_auto_repeat_interval { 0 }; int m_auto_repeat_interval { 0 };