beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add TextBox::onReturnPressed.

Browse source
This commit is contained in:
Andreas Kling 2018-10-13 23:19:44 +02:00
parent 7a0a7abc52
commit d305c316e1
Notes: sideshowbarker 2024-07-19 18:48:43 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/d305c316e11
5 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Widgets/Event.h
View file

@ -105,6 +105,7 @@ enum KeyboardKey {
UpArrow,
DownArrow,
Backspace,
Return,
};
class KeyEvent final : public Event {

1
Widgets/EventLoopSDL.cpp
View file

@ -40,6 +40,7 @@ void EventLoopSDL::handleKeyEvent(Event::Type type, const SDL_KeyboardEvent& sdl
case SDLK_UP: key = KeyboardKey::UpArrow; break;
case SDLK_DOWN: key = KeyboardKey::DownArrow; break;
case SDLK_BACKSPACE: key = KeyboardKey::Backspace; break;
case SDLK_RETURN: key = KeyboardKey::Return; break;
}
keyEvent->m_key = key;

6
Widgets/TextBox.cpp
View file

@ -56,7 +56,7 @@ void TextBox::paintEvent(PaintEvent&)
painter.drawBitmap({x, y}, *bitmap, Color::Black);
}
if (m_cursorBlinkState) {
if (isFocused() && m_cursorBlinkState) {
unsigned visibleCursorPosition = m_cursorPosition - firstVisibleChar;
Rect cursorRect(innerRect.x() + visibleCursorPosition * font.glyphWidth(), innerRect.y(), 1, innerRect.height());
painter.fillRect(cursorRect, foregroundColor());
@ -107,6 +107,10 @@ void TextBox::keyDownEvent(KeyEvent& event)
return;
case KeyboardKey::Backspace:
return handleBackspace();
case KeyboardKey::Return:
if (onReturnPressed)
onReturnPressed(*this);
return;
}
if (!event.text().isEmpty()) {

3
Widgets/TextBox.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "Widget.h"
#include <functional>
class TextBox final : public Widget {
public:
@ -10,6 +11,8 @@ public:
String text() const { return m_text; }
void setText(String&&);
std::function<void(TextBox&)> onReturnPressed;
private:
virtual void paintEvent(PaintEvent&) override;
virtual void mouseDownEvent(MouseEvent&) override;

4
Widgets/test.cpp
View file

@ -83,6 +83,10 @@ int main(int argc, char** argv)
tb->setText("Hello!");
tb->setFocus(true);
tb->onReturnPressed = [] (TextBox& textBox) {
printf("TextBox %p return pressed: '%s'\n", &textBox, textBox.text().characters());
};
WindowManager::the().setActiveWindow(widgetTestWindow);
}