Nux

Merge lp://qastaging/~jaytaoko/nux/nux-renamed-event-members into lp://qastaging/nux/2.0

  1. nux-renamed-event-members
  2. Merge into 2.0
Proposed by Jay Taoko
Status: Merged
Approved by: Jay Taoko
Approved revision: 536
Merged at revision: 534
Proposed branch: lp://qastaging/~jaytaoko/nux/nux-renamed-event-members
Merge into: lp://qastaging/nux/2.0
Diff against target: 3114 lines (+640/-918)
24 files modified
Nux/ActionItem.cpp (+1/-3)
Nux/Area.h (+1/-1)
Nux/BaseWindow.h (+0/-1)
Nux/ComboBoxSimple.cpp (+2/-2)
Nux/EditTextBox.cpp (+4/-4)
Nux/FloatingWindow.h (+0/-1)
Nux/InputArea.cpp (+10/-36)
Nux/InputArea.h (+8/-18)
Nux/Makefile.am (+0/-2)
Nux/MouseHandler.cpp (+0/-237)
Nux/MouseHandler.h (+0/-91)
Nux/WindowCompositor.cpp (+86/-86)
Nux/WindowThread.cpp (+60/-60)
NuxGraphics/Events.cpp (+80/-44)
NuxGraphics/Events.h (+139/-85)
NuxGraphics/GraphicsDisplayWin.cpp (+106/-106)
NuxGraphics/GraphicsDisplayX11.cpp (+131/-129)
configure.ac (+1/-1)
gputests/framebufferobject.cpp (+2/-2)
gputests/quad_2texmod.cpp (+2/-2)
gputests/texture_blur.cpp (+2/-2)
gputests/texture_copy_blur.cpp (+2/-2)
gputests/texture_data.cpp (+1/-1)
gputests/texture_power_of_2.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~jaytaoko/nux/nux-renamed-event-members
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+87426@code.qastaging.launchpad.net

Description of the change

 * In Event class, replaced the following members:
     e_x
     e_y
     e_x_root
     e_y_root
     e_dx
     e_dy
     e_clicks
     e_is_click
     e_event
     e_x11_timestamp
     e_x11_window
     e_x11_state
     e_x11_keycode
     e_keysym
     e_wheeldelta
     e_text
     e_key_modifiers
     e_mouse_state
     e_key_repeat_count

 with
     x
     y
     x_root
     y_root
     dx
     dy
     clicks
     is_click
     type
     x11_timestamp
     x11_window
     x11_key_state
     x11_keycode
     x11_keysym
     x11_wheeldelta
     text
     key_modifiers
     mouse_state
     key_repeat_count

 * Rename parameters in enum:
     - MouseButton
     - KeyModifier
 * NuxEvenType renamed to EventType

 * Removed:
  - InputArea::SetKeyboardFocus
  - InputArea::GetMouseX
     - InputArea::GetMouseY
     - InputArea::SetAreaMousePosition

 * Removed obsolete files MouseHandler.h/.cpp

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

Looking ok sofar, but what about the mentioned TODOs:

 * MouseFocusOnOtherArea
 * SetKeyboardFocus
 * Mod3Mask, Mod5Mask

When do you plan to implement them or are there any blockers preventing you from doing so? They don't seem to affect nux and unity right now, as my initial testing (using) of unity didn't expose any regressions... which is a good sign :)

Revision history for this message
Mirco Müller (macslow) wrote :

Doh... bump... see comment above.

review: Needs Information
Revision history for this message
Jay Taoko (jaytaoko) wrote :

The todos related to MouseFocusOnOtherArea and SetKeyboardFocus are in files that aren't used in Unity.
In fact the EditTextBox class will soon be deprecated. And ActionItem class needs a rework.

As for Mod3Mask and Mod5Mask, it seems that my keyboard does not have the keys to generate them. I think I need more information on this.

Revision history for this message
Mirco Müller (macslow) wrote :

Approved

review: Approve
lp://qastaging/~jaytaoko/nux/nux-renamed-event-members updated
536. By Jay Taoko

* Bumped ABI version number

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: