nosklo
/
DrawOnYourScreen
mirror of https://codeberg.org/som/DrawOnYourScreen
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rework of key event handling 

* Handle stage key events only when the area is reactive. Any reason to handle key events in other cases?
* Move `Escape` key handling to the stage `key-press-event` handler. So leaving the drawing mode with `Escape` is still possible when the overview mode has been entered inadvertently.
This commit is contained in:
abakkk 2020-10-05 16:46:16 +02:00
parent 28def0059d
commit ff350130a4
1 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
area.js
View File

@ -395,8 +395,14 @@ var DrawingArea = new Lang.Class({
}, },
_onStageKeyPressed: function(actor, event) { _onStageKeyPressed: function(actor, event) {
if (event.get_key_symbol() == Clutter.KEY_space) if (event.get_key_symbol() == Clutter.KEY_Escape) {
if (this.helper.visible)
this.toggleHelp();
else
this.emit('leave-drawing-mode');
} else if (event.get_key_symbol() == Clutter.KEY_space) {
this.spaceKeyPressed = true; this.spaceKeyPressed = true;
}
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
}, },
@ -409,38 +415,28 @@ var DrawingArea = new Lang.Class({
}, },
_onKeyPressed: function(actor, event) { _onKeyPressed: function(actor, event) {
if (this.currentElement && this.currentElement.shape == Shapes.LINE) { if (this.currentElement && this.currentElement.shape == Shapes.LINE &&
if (event.get_key_symbol() == Clutter.KEY_Return || (event.get_key_symbol() == Clutter.KEY_Return ||
event.get_key_symbol() == Clutter.KEY_KP_Enter || event.get_key_symbol() == Clutter.KEY_KP_Enter ||
event.get_key_symbol() == Clutter.KEY_Control_L) { event.get_key_symbol() == Clutter.KEY_Control_L)) {
if (this.currentElement.points.length == 2)
// Translators: %s is a key label if (this.currentElement.points.length == 2)
this.emit('show-osd', Files.Icons.ARC, _("Press <i>%s</i> to get\na fourth control point") // Translators: %s is a key label
.format(Gtk.accelerator_get_label(Clutter.KEY_Return, 0)), "", -1, true); this.emit('show-osd', Files.Icons.ARC, _("Press <i>%s</i> to get\na fourth control point")
this.currentElement.addPoint(); .format(Gtk.accelerator_get_label(Clutter.KEY_Return, 0)), "", -1, true);
this.updatePointerCursor(true); this.currentElement.addPoint();
this._redisplay(); this.updatePointerCursor(true);
return Clutter.EVENT_STOP; this._redisplay();
} else { return Clutter.EVENT_STOP;
return Clutter.EVENT_PROPAGATE;
}
} else if (this.currentElement && } else if (this.currentElement &&
(this.currentElement.shape == Shapes.POLYGON || this.currentElement.shape == Shapes.POLYLINE) && (this.currentElement.shape == Shapes.POLYGON || this.currentElement.shape == Shapes.POLYLINE) &&
(event.get_key_symbol() == Clutter.KEY_Return || event.get_key_symbol() == Clutter.KEY_KP_Enter)) { (event.get_key_symbol() == Clutter.KEY_Return || event.get_key_symbol() == Clutter.KEY_KP_Enter)) {
this.currentElement.addPoint(); this.currentElement.addPoint();
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} else if (event.get_key_symbol() == Clutter.KEY_Escape) {
if (this.helper.visible)
this.toggleHelp();
else
this.emit('leave-drawing-mode');
return Clutter.EVENT_STOP;
} else {
return Clutter.EVENT_PROPAGATE;
} }
return Clutter.EVENT_PROPAGATE;
}, },
_onScroll: function(actor, event) { _onScroll: function(actor, event) {
@ -1186,6 +1182,21 @@ var DrawingArea = new Lang.Class({
this.toggleHelp(); this.toggleHelp();
if (this.textEntry && this.reactive) if (this.textEntry && this.reactive)
this.textEntry.grab_key_focus(); this.textEntry.grab_key_focus();
if (this.reactive) {
this.stageKeyPressedHandler = global.stage.connect('key-press-event', this._onStageKeyPressed.bind(this));
this.stageKeyReleasedHandler = global.stage.connect('key-release-event', this._onStageKeyReleased.bind(this));
} else {
if (this.stageKeyPressedHandler) {
global.stage.disconnect(this.stageKeyPressedHandler);
this.stageKeyPressedHandler = null;
}
if (this.stageKeyReleasedHandler) {
global.stage.disconnect(this.stageKeyReleasedHandler);
this.stageKeyReleasedHandler = null;
}
this.spaceKeyPressed = false;
}
}, },
_onDestroy: function() { _onDestroy: function() {
@ -1200,8 +1211,6 @@ var DrawingArea = new Lang.Class({
}, },
enterDrawingMode: function() { enterDrawingMode: function() {
this.stageKeyPressedHandler = global.stage.connect('key-press-event', this._onStageKeyPressed.bind(this));
this.stageKeyReleasedHandler = global.stage.connect('key-release-event', this._onStageKeyReleased.bind(this));
this.keyPressedHandler = this.connect('key-press-event', this._onKeyPressed.bind(this)); this.keyPressedHandler = this.connect('key-press-event', this._onKeyPressed.bind(this));
this.buttonPressedHandler = this.connect('button-press-event', this._onButtonPressed.bind(this)); this.buttonPressedHandler = this.connect('button-press-event', this._onButtonPressed.bind(this));
this.keyboardPopupMenuHandler = this.connect('popup-menu', this._onKeyboardPopupMenu.bind(this)); this.keyboardPopupMenuHandler = this.connect('popup-menu', this._onKeyboardPopupMenu.bind(this));
@ -1210,14 +1219,6 @@ var DrawingArea = new Lang.Class({
}, },
leaveDrawingMode: function(save, erase) { leaveDrawingMode: function(save, erase) {
if (this.stageKeyPressedHandler) {
global.stage.disconnect(this.stageKeyPressedHandler);
this.stageKeyPressedHandler = null;
}
if (this.stageKeyReleasedHandler) {
global.stage.disconnect(this.stageKeyReleasedHandler);
this.stageKeyReleasedHandler = null;
}
if (this.keyPressedHandler) { if (this.keyPressedHandler) {
this.disconnect(this.keyPressedHandler); this.disconnect(this.keyPressedHandler);
this.keyPressedHandler = null; this.keyPressedHandler = null;