summaryrefslogtreecommitdiff
path: root/plugingui/widget.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-11-18 21:00:48 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2015-11-18 21:00:48 +0100
commitc1973bc4d4ec9d8d18a690359a2d649905e35264 (patch)
tree045c4d5afc28422319c4e20322fbafe97fefd280 /plugingui/widget.h
parentf11a61a36fa5e21b0c6c2362af2952a3f87408a0 (diff)
Refactored Slider. Expanded all event variable names (all was 'e' before). Changed all uievent enums to enum classes.
Diffstat (limited to 'plugingui/widget.h')
-rw-r--r--plugingui/widget.h31
1 files changed, 16 insertions, 15 deletions
diff --git a/plugingui/widget.h b/plugingui/widget.h
index 32acd5c..806ee5c 100644
--- a/plugingui/widget.h
+++ b/plugingui/widget.h
@@ -45,15 +45,16 @@ public:
virtual void show();
virtual void hide();
- virtual void resize(int width, int height);
- virtual void move(size_t x, size_t y);
+ // From LayoutItem
+ virtual void resize(int width, int height) override;
+ virtual void move(size_t x, size_t y) override;
+ virtual size_t x() override;
+ virtual size_t y() override;
+ virtual size_t width() override;
+ virtual size_t height() override;
- virtual size_t x();
- virtual size_t y();
virtual size_t windowX();
virtual size_t windowY();
- virtual size_t width();
- virtual size_t height();
virtual bool isFocusable() { return false; }
virtual bool catchMouse() { return false; }
@@ -61,23 +62,23 @@ public:
void addChild(Widget *widget);
void removeChild(Widget *widget);
- virtual void repaintEvent(RepaintEvent *e) {}
- virtual void mouseMoveEvent(MouseMoveEvent *e) {}
- virtual void buttonEvent(ButtonEvent *e) {}
- virtual void scrollEvent(ScrollEvent *e) {}
- virtual void keyEvent(KeyEvent *e) {}
+ virtual void repaintEvent(RepaintEvent* repaintEvent) {}
+ virtual void mouseMoveEvent(MouseMoveEvent* mouseMoveEvent) {}
+ virtual void buttonEvent(ButtonEvent* buttonEvent) {}
+ virtual void scrollEvent(ScrollEvent* scrollEvent) {}
+ virtual void keyEvent(KeyEvent* keyEvent) {}
virtual void mouseLeaveEvent() {}
virtual void mouseEnterEvent() {}
- Widget *find(size_t x, size_t y);
+ Widget* find(size_t x, size_t y);
- virtual Window *window();
+ virtual Window* window();
- void repaint_r(RepaintEvent *e);
+ void repaint_r(RepaintEvent* repaintEvent);
PixelBufferAlpha pixbuf;
- std::vector<PixelBufferAlpha *> getPixelBuffers();
+ std::vector<PixelBufferAlpha*> getPixelBuffers();
bool hasKeyboardFocus();