1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 09:58:14 +00:00

LibGUI: Start bringing up GTextBox in the standalone world.

This commit is contained in:
Andreas Kling 2019-01-26 06:39:13 +01:00
parent 57fb027216
commit d72575d196
10 changed files with 165 additions and 121 deletions

View file

@ -99,16 +99,6 @@ enum class GMouseButton : byte {
Middle = 4,
};
enum GKeyboardKey {
Invalid,
LeftArrow,
RightArrow,
UpArrow,
DownArrow,
Backspace,
Return,
};
class GKeyEvent final : public GEvent {
public:
GKeyEvent(Type type, int key)

View file

@ -83,6 +83,17 @@ void GEventLoop::handle_paint_event(const GUI_Event& event, GWindow& window)
post_event(&window, make<GPaintEvent>(event.paint.rect));
}
void GEventLoop::handle_key_event(const GUI_Event& event, GWindow& window)
{
auto key_event = make<GKeyEvent>(event.type == GUI_Event::Type::KeyDown ? GEvent::KeyDown : GEvent::KeyUp, event.key.key);
key_event->m_alt = event.key.alt;
key_event->m_ctrl = event.key.ctrl;
key_event->m_shift = event.key.shift;
if (event.key.character != '\0')
key_event->m_text = String(&event.key.character, 1);
post_event(&window, move(key_event));
}
void GEventLoop::handle_mouse_event(const GUI_Event& event, GWindow& window)
{
GMouseEvent::Type type;
@ -149,6 +160,11 @@ void GEventLoop::wait_for_event()
case GUI_Event::Type::WindowDeactivated:
dbgprintf("WID=%x WindowDeactivated\n", event.window_id);
break;
case GUI_Event::Type::KeyDown:
case GUI_Event::Type::KeyUp:
dbgprintf("WID=%x KeyEvent character=0x%b\n", event.window_id, event.key.character);
handle_key_event(event, *window);
break;
}
}
}

View file

@ -27,6 +27,7 @@ private:
void wait_for_event();
void handle_paint_event(const GUI_Event&, GWindow&);
void handle_mouse_event(const GUI_Event&, GWindow&);
void handle_key_event(const GUI_Event&, GWindow&);
struct QueuedEvent {
GObject* receiver { nullptr };

View file

@ -3,6 +3,7 @@
#include <SharedGraphics/CharacterBitmap.h>
#include <SharedGraphics/Font.h>
#include <SharedGraphics/Painter.h>
#include <Kernel/KeyCode.h>
GTextBox::GTextBox(GWidget* parent)
: GWidget(parent)
@ -91,21 +92,21 @@ void GTextBox::handle_backspace()
void GTextBox::keydown_event(GKeyEvent& event)
{
switch (event.key()) {
case GKeyboardKey::LeftArrow:
case KeyCode::Key_Left:
if (m_cursorPosition)
--m_cursorPosition;
m_cursorBlinkState = true;
update();
return;
case GKeyboardKey::RightArrow:
case KeyCode::Key_Right:
if (m_cursorPosition < m_text.length())
++m_cursorPosition;
m_cursorBlinkState = true;
update();
return;
case GKeyboardKey::Backspace:
case KeyCode::Key_Backspace:
return handle_backspace();
case GKeyboardKey::Return:
case KeyCode::Key_Return:
if (onReturnPressed)
onReturnPressed(*this);
return;

View file

@ -96,6 +96,12 @@ void GWindow::event(GEvent& event)
ASSERT(rc == 0);
}
if (event.is_key_event()) {
if (!m_focused_widget)
return;
return m_focused_widget->event(event);
}
return GObject::event(event);
}
@ -128,3 +134,13 @@ void GWindow::set_main_widget(GWidget* widget)
widget->set_window(this);
update();
}
void GWindow::set_focused_widget(GWidget* widget)
{
if (m_focused_widget == widget)
return;
if (m_focused_widget)
m_focused_widget->update();
m_focused_widget = widget;
m_focused_widget->update();
}

View file

@ -38,6 +38,7 @@ public:
GWidget* main_widget() { return m_main_widget; }
const GWidget* main_widget() const { return m_main_widget; }
void set_main_widget(GWidget*);
void set_focused_widget(GWidget*);
void show();
@ -47,5 +48,6 @@ private:
RetainPtr<GraphicsBitmap> m_backing;
int m_window_id { -1 };
GWidget* m_main_widget { nullptr };
GWidget* m_focused_widget { nullptr };
};