RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-13 17:32:06 +00:00
Code Issues Activity Actions

More VFS cleanup.

Browse source
This commit is contained in:
Andreas Kling 2018-11-15 15:36:35 +01:00
parent 396a32835b
commit 8fa2d7104a
22 changed files with 92 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Widgets/Button.h
View file

@ -18,7 +18,7 @@ private:
virtual void mouseDownEvent(MouseEvent&) override;
virtual void mouseUpEvent(MouseEvent&) override;
virtual const char* className() const override { return "Button"; }
virtual const char* class_name() const override { return "Button"; }
String m_caption;
bool m_beingPressed { false };

2
Widgets/CheckBox.h
View file

@ -18,7 +18,7 @@ private:
virtual void paintEvent(PaintEvent&) override;
virtual void mouseDownEvent(MouseEvent&) override;
virtual const char* className() const override { return "CheckBox"; }
virtual const char* class_name() const override { return "CheckBox"; }
String m_caption;
bool m_isChecked { false };

2
Widgets/Label.h
View file

@ -15,7 +15,7 @@ private:
virtual void paintEvent(PaintEvent&) override;
virtual void mouseMoveEvent(MouseEvent&) override;
virtual const char* className() const override { return "Label"; }
virtual const char* class_name() const override { return "Label"; }
String m_text;
};

2
Widgets/Object.h
View file

@ -11,7 +11,7 @@ public:
Object(Object* parent = nullptr);
virtual ~Object();
virtual const char* className() const { return "Object"; }
virtual const char* class_name() const { return "Object"; }
virtual void event(Event&);

2
Widgets/Widget.h
View file

@ -48,7 +48,7 @@ public:
};
HitTestResult hitTest(int x, int y);
virtual const char* className() const override { return "Widget"; }
virtual const char* class_name() const override { return "Widget"; }
void setWindowRelativeRect(const Rect&);

4
Widgets/Window.cpp
View file

@ -57,7 +57,7 @@ void Window::event(Event& event)
//printf("Window{%p}: %s %d,%d\n", this, me.name(), me.x(), me.y());
if (m_mainWidget) {
auto result = m_mainWidget->hitTest(me.x(), me.y());
//printf("hit test for %d,%d found: %s{%p} %d,%d\n", me.x(), me.y(), result.widget->className(), result.widget, result.localX, result.localY);
//printf("hit test for %d,%d found: %s{%p} %d,%d\n", me.x(), me.y(), result.widget->class_name(), result.widget, result.localX, result.localY);
// FIXME: Re-use the existing event instead of crafting a new one?
auto localEvent = make<MouseEvent>(event.type(), result.localX, result.localY, me.button());
return result.widget->event(*localEvent);
@ -67,7 +67,7 @@ void Window::event(Event& event)
if (event.isPaintEvent()) {
auto& pe = static_cast<PaintEvent&>(event);
printf("Window[\"%s\"]: paintEvent %d,%d %dx%d\n", className(),
printf("Window[\"%s\"]: paintEvent %d,%d %dx%d\n", class_name(),
pe.rect().x(),
pe.rect().y(),
pe.rect().width(),