Skip to content

Commit

Permalink
LibGUI: Remove copy-pasted auto-repeat logic from ColorInput
Browse files Browse the repository at this point in the history
This was copy-pasted from button classes and not useful here.
  • Loading branch information
awesomekling committed Apr 29, 2020
1 parent 40fe076 commit 033a4ae
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 19 deletions.
14 changes: 1 addition & 13 deletions Libraries/LibGUI/ColorInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ ColorInput::ColorInput()
: TextEditor(TextEditor::SingleLine)
{
set_readonly(true);

m_auto_repeat_timer = add<Core::Timer>();
m_auto_repeat_timer->on_timeout = [this] {
click();
};
}

ColorInput::~ColorInput()
Expand All @@ -64,11 +59,6 @@ void ColorInput::mousedown_event(MouseEvent& event)
if (is_enabled()) {
m_being_pressed = true;
update();

if (m_auto_repeat_interval) {
click();
m_auto_repeat_timer->start(m_auto_repeat_interval);
}
}
}

Expand All @@ -78,13 +68,11 @@ void ColorInput::mousedown_event(MouseEvent& event)
void ColorInput::mouseup_event(MouseEvent& event)
{
if (event.button() == MouseButton::Left) {
bool was_auto_repeating = m_auto_repeat_timer->is_active();
m_auto_repeat_timer->stop();
if (is_enabled()) {
bool was_being_pressed = m_being_pressed;
m_being_pressed = false;
update();
if (was_being_pressed && !was_auto_repeating)
if (was_being_pressed)
click();
}
}
Expand Down
10 changes: 4 additions & 6 deletions Libraries/LibGUI/ColorInput.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@

namespace GUI {

class ColorInput : public TextEditor {
C_OBJECT(ColorInput)
class ColorInput final : public TextEditor {
C_OBJECT(ColorInput);

public:
ColorInput();
virtual ~ColorInput() override;

void set_color(Color color);
void set_color(Color);
Color color() { return m_color; }

void set_color_picker_title(String title) { m_color_picker_title = title; }
Expand All @@ -53,14 +53,12 @@ class ColorInput : public TextEditor {
virtual void paint_event(PaintEvent&) override;

private:
virtual void click();
void click();

Color m_color;
String m_color_picker_title { "Select Color" };

int m_auto_repeat_interval { 0 };
bool m_being_pressed { false };
RefPtr<Core::Timer> m_auto_repeat_timer;
};

}

0 comments on commit 033a4ae

Please sign in to comment.