Hash :
ccbc9e9b
Author :
Date :
2025-08-20T05:28:12
Revert "Rename enums to fix GCC -Wchanges-meaning error" This reverts commit dc24ecca9ed920c0269e9d62dfcac4b3f3e5a4d4. Reason for revert: breaks ios-simulator build when rolled to Chromium https://chromium-review.googlesource.com/c/chromium/src/+/6863632 https://ci.chromium.org/ui/p/chromium/builders/try/ios-simulator/2446924/overview [10968/78005] OBJCXX obj/third_party/angle/util/angle_util_static/IOSWindow.o sdk/xcode_links/iPhoneSimulator18.2.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSDictionary.h:17:38: error: reference to 'KeyType' is ambiguous 17 | - (nullable ObjectType)objectForKey:(KeyType)aKey; BUG: angleproject:438226513 Original change's description: > Rename enums to fix GCC -Wchanges-meaning error > > Renamed enums Key and MouseButton to enum class KeyType and > MouseButtonType to avoid name conflicts with union members in > Event.h on GCC, and to follow the ANGLE style guide preference > for scoped enums. > > BUG: angleproject:438226513 > Change-Id: I8892b438b3b05a3ce4e14f8c0769b81722688da8 > Signed-off-by: Sungyong Choi <sywow.choi@samsung.com> > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6845484 > Commit-Queue: Geoff Lang <geofflang@chromium.org> > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > Reviewed-by: Geoff Lang <geofflang@chromium.org> Bug: angleproject:438226513 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: Iff0d925b9fa608215cff0e472074a0315f14e861 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6863019 Auto-Submit: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
//
// Copyright 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
#ifndef SAMPLE_UTIL_EVENT_H
#define SAMPLE_UTIL_EVENT_H
#include "keyboard.h"
#include "mouse.h"
class Event
{
public:
struct MoveEvent
{
int X;
int Y;
};
struct SizeEvent
{
int Width;
int Height;
};
struct KeyEvent
{
Key Code;
bool Alt;
bool Control;
bool Shift;
bool System;
};
struct MouseMoveEvent
{
int X;
int Y;
};
struct MouseButtonEvent
{
MouseButton Button;
int X;
int Y;
};
struct MouseWheelEvent
{
int Delta;
};
enum EventType
{
EVENT_CLOSED, // The window requested to be closed
EVENT_MOVED, // The window has moved
EVENT_RESIZED, // The window was resized
EVENT_LOST_FOCUS, // The window lost the focus
EVENT_GAINED_FOCUS, // The window gained the focus
EVENT_TEXT_ENTERED, // A character was entered
EVENT_KEY_PRESSED, // A key was pressed
EVENT_KEY_RELEASED, // A key was released
EVENT_MOUSE_WHEEL_MOVED, // The mouse wheel was scrolled
EVENT_MOUSE_BUTTON_PRESSED, // A mouse button was pressed
EVENT_MOUSE_BUTTON_RELEASED, // A mouse button was released
EVENT_MOUSE_MOVED, // The mouse cursor moved
EVENT_MOUSE_ENTERED, // The mouse cursor entered the area of the window
EVENT_MOUSE_LEFT, // The mouse cursor left the area of the window
EVENT_TEST, // Event for testing purposes
};
EventType Type;
union
{
MoveEvent Move; // Move event parameters
SizeEvent Size; // Size event parameters
KeyEvent Key; // Key event parameters
MouseMoveEvent MouseMove; // Mouse move event parameters
MouseButtonEvent MouseButton; // Mouse button event parameters
MouseWheelEvent MouseWheel; // Mouse wheel event parameters
};
};
#endif // SAMPLE_UTIL_EVENT_H