FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas: Remove old event handling code

Browse Source
This commit is contained in:
Thomas Geymayer 2012-12-16 19:02:21 +01:00
parent f6270ec395
commit ac27fae712
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
simgear/canvas/Canvas.cxx
View File

@ -66,15 +66,6 @@ namespace canvas
_view_height(-1), _view_height(-1),
_status(node, "status"), _status(node, "status"),
_status_msg(node, "status-msg"), _status_msg(node, "status-msg"),
_mouse_x(node, "mouse/x"),
_mouse_y(node, "mouse/y"),
_mouse_dx(node, "mouse/dx"),
_mouse_dy(node, "mouse/dy"),
_mouse_button(node, "mouse/button"),
_mouse_state(node, "mouse/state"),
_mouse_mod(node, "mouse/mod"),
_mouse_scroll(node, "mouse/scroll"),
_mouse_event(node, "mouse/event"),
_sampling_dirty(false), _sampling_dirty(false),
_render_dirty(true), _render_dirty(true),
_visible(true), _visible(true),
@ -365,17 +356,6 @@ namespace canvas
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool Canvas::handleMouseEvent(const MouseEventPtr& event) bool Canvas::handleMouseEvent(const MouseEventPtr& event)
{ {
_mouse_x = event->client_pos.x();
_mouse_y = event->client_pos.y();
_mouse_dx = event->delta.x();
_mouse_dy = event->delta.y();
_mouse_button = event->button;
_mouse_state = event->state;
_mouse_mod = event->mod;
//_mouse_scroll = event.scroll;
// Always set event type last because all listeners are attached to it
_mouse_event = event->type;
if( !_root_group.get() ) if( !_root_group.get() )
return false; return false;
@ -547,10 +527,9 @@ namespace canvas
void Canvas::setStatusFlags(unsigned int flags, bool set) void Canvas::setStatusFlags(unsigned int flags, bool set)
{ {
if( set ) if( set )
_status = _status | flags; _status |= flags;
else else
_status = _status & ~flags; _status &= ~flags;
// TODO maybe extend simgear::PropertyObject to allow |=, &= etc.
if( (_status & MISSING_SIZE_X) && (_status & MISSING_SIZE_Y) ) if( (_status & MISSING_SIZE_X) && (_status & MISSING_SIZE_Y) )
_status_msg = "Missing size"; _status_msg = "Missing size";

8
simgear/canvas/Canvas.hxx
View File

@ -148,14 +148,6 @@ namespace canvas
PropertyObject<int> _status; PropertyObject<int> _status;
PropertyObject<std::string> _status_msg; PropertyObject<std::string> _status_msg;
PropertyObject<int> _mouse_x, _mouse_y,
_mouse_dx, _mouse_dy,
_mouse_button,
_mouse_state,
_mouse_mod,
_mouse_scroll,
_mouse_event;
bool _sampling_dirty, bool _sampling_dirty,
_render_dirty, _render_dirty,
_visible; _visible;