brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js: Avoid Clutter.get_current_event() in Clutter.Actor event vfuncs

Browse Source 
We sometimes obtained the current event through the general machinery
just so we could pass it along as a ClutterEvent instead of a specialized
subtype.

We now get that out of the box, so may avoid getting the current event
which is just a cast of the same current event we already have.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2872>
This commit is contained in:
Carlos Garnacho 2023-08-08 18:22:11 +02:00
parent 8423ba44fe
commit d56b05b5c3
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/modalDialog.js
View File

@ -111,8 +111,8 @@ export const ModalDialog = GObject.registerClass({
this.notify('state'); this.notify('state');
} }
vfunc_key_press_event() { vfunc_key_press_event(event) {
if (global.focus_manager.navigate_from_event(Clutter.get_current_event())) if (global.focus_manager.navigate_from_event(event))
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;

4
js/ui/popupMenu.js
View File

@ -143,7 +143,7 @@ export const PopupBaseMenuItem = GObject.registerClass({
} }
vfunc_key_press_event(event) { vfunc_key_press_event(event) {
if (global.focus_manager.navigate_from_event(Clutter.get_current_event())) if (global.focus_manager.navigate_from_event(event))
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
if (!this._activatable) if (!this._activatable)
@ -162,7 +162,7 @@ export const PopupBaseMenuItem = GObject.registerClass({
let symbol = event.get_key_symbol(); let symbol = event.get_key_symbol();
if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) { if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
this.activate(Clutter.get_current_event()); this.activate(event);
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} }
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;

15
js/ui/slider.js
View File

@ -61,8 +61,8 @@ export const Slider = GObject.registerClass({
cr.$dispose(); cr.$dispose();
} }
vfunc_button_press_event() { vfunc_button_press_event(event) {
return this.startDragging(Clutter.get_current_event()); return this.startDragging(event);
} }
startDragging(event) { startDragging(event) {
@ -117,8 +117,7 @@ export const Slider = GObject.registerClass({
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
} }
vfunc_touch_event() { vfunc_touch_event(event) {
let event = Clutter.get_current_event();
let sequence = event.get_event_sequence(); let sequence = event.get_event_sequence();
if (!this._dragging && if (!this._dragging &&
@ -159,13 +158,13 @@ export const Slider = GObject.registerClass({
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} }
vfunc_scroll_event() { vfunc_scroll_event(event) {
return this.scroll(Clutter.get_current_event()); return this.scroll(event);
} }
vfunc_motion_event() { vfunc_motion_event(event) {
if (this._dragging && !this._grabbedSequence) if (this._dragging && !this._grabbedSequence)
return this._motionEvent(this, Clutter.get_current_event()); return this._motionEvent(this, event);
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
} }