diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:41:07 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:41:07 +0000 |
| commit | f8d74230b839def072f26049845bd9003d87eb26 (patch) | |
| tree | 7d5ecb668377162dab0260e7fe107018115b904e /ui/views/ime | |
| parent | 2212d27f2cc41983901f45299cda82d704c76e82 (diff) | |
| download | chromium_src-f8d74230b839def072f26049845bd9003d87eb26.zip chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.gz chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.bz2 | |
Rename ui::EventFlags mouse flags to be more sensible
Changes EF_(LEFT|MIDDLE|RIGHT)_BUTTON_DOWN to
EF_(LEF|MIDDLE|RIGHT)_MOUSE_BUTTON since these are not
specific to "down" button events.
This is follow up from review http://codereview.chromium.org/8953037
BUG=none
TEST=Compiles.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/9007016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/ime')
| -rw-r--r-- | ui/views/ime/input_method_ibus.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/views/ime/input_method_ibus.cc b/ui/views/ime/input_method_ibus.cc index a68c74f..8f50875 100644 --- a/ui/views/ime/input_method_ibus.cc +++ b/ui/views/ime/input_method_ibus.cc @@ -48,9 +48,9 @@ int EventFlagsFromIBusState(guint32 state) { (state & IBUS_CONTROL_MASK ? ui::EF_CONTROL_DOWN : 0) | (state & IBUS_SHIFT_MASK ? ui::EF_SHIFT_DOWN : 0) | (state & IBUS_MOD1_MASK ? ui::EF_ALT_DOWN : 0) | - (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_BUTTON_DOWN : 0) | - (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_BUTTON_DOWN : 0) | - (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_BUTTON_DOWN : 0); + (state & IBUS_BUTTON1_MASK ? ui::EF_LEFT_MOUSE_BUTTON : 0) | + (state & IBUS_BUTTON2_MASK ? ui::EF_MIDDLE_MOUSE_BUTTON : 0) | + (state & IBUS_BUTTON3_MASK ? ui::EF_RIGHT_MOUSE_BUTTON : 0); } // Converts event flags to ibus key state flags. @@ -59,9 +59,9 @@ guint32 IBusStateFromEventFlags(int flags) { (flags & ui::EF_CONTROL_DOWN ? IBUS_CONTROL_MASK : 0) | (flags & ui::EF_SHIFT_DOWN ? IBUS_SHIFT_MASK : 0) | (flags & ui::EF_ALT_DOWN ? IBUS_MOD1_MASK : 0) | - (flags & ui::EF_LEFT_BUTTON_DOWN ? IBUS_BUTTON1_MASK : 0) | - (flags & ui::EF_MIDDLE_BUTTON_DOWN ? IBUS_BUTTON2_MASK : 0) | - (flags & ui::EF_RIGHT_BUTTON_DOWN ? IBUS_BUTTON3_MASK : 0); + (flags & ui::EF_LEFT_MOUSE_BUTTON ? IBUS_BUTTON1_MASK : 0) | + (flags & ui::EF_MIDDLE_MOUSE_BUTTON ? IBUS_BUTTON2_MASK : 0) | + (flags & ui::EF_RIGHT_MOUSE_BUTTON ? IBUS_BUTTON3_MASK : 0); } void IBusKeyEventFromViewsKeyEvent(const views::KeyEvent& key, |