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

Minor, key symbols

This commit is contained in:
abakkk 2020-06-22 12:45:54 +02:00
parent 7f039398d0
commit 10384c06e6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
draw.js
View File

@ -346,26 +346,27 @@ var DrawingArea = new Lang.Class({
}, },
_onKeyPressed: function(actor, event) { _onKeyPressed: function(actor, event) {
let [keySymbol, ctrlPressed] = [event.get_key_symbol(), event.has_control_modifier()];
if (this.currentElement && this.currentElement.shape == Shapes.TEXT && this.currentElement.textState == TextStates.WRITING) { if (this.currentElement && this.currentElement.shape == Shapes.TEXT && this.currentElement.textState == TextStates.WRITING) {
if (event.get_key_symbol() == Clutter.KEY_Escape) { if (keySymbol == Clutter.KEY_Escape) {
// finish writing // finish writing
this._stopWriting(); this._stopWriting();
} else if (event.get_key_symbol() == Clutter.KEY_BackSpace) { } else if (keySymbol == Clutter.KEY_BackSpace) {
this.currentElement.text = this.currentElement.text.slice(0, -1); this.currentElement.text = this.currentElement.text.slice(0, -1);
this._updateTextCursorTimeout(); this._updateTextCursorTimeout();
} else if (event.has_control_modifier() && event.get_key_symbol() == 118) { } else if (ctrlPressed && keySymbol == Clutter.KEY_v) {
// Ctrl + V // Ctrl + V
St.Clipboard.get_default().get_text(St.ClipboardType.CLIPBOARD, (clipBoard, clipText) => { St.Clipboard.get_default().get_text(St.ClipboardType.CLIPBOARD, (clipBoard, clipText) => {
this.currentElement.text += clipText; this.currentElement.text += clipText;
this._updateTextCursorTimeout(); this._updateTextCursorTimeout();
this._redisplay(); this._redisplay();
}); });
} else if (event.get_key_symbol() == Clutter.KEY_Return || event.get_key_symbol() == 65421) { } else if (keySymbol == Clutter.KEY_Return || keySymbol == Clutter.KEY_KP_Enter) {
// Clutter.KEY_Return is "Enter" and 65421 is KP_Enter
// start a new line // start a new line
let startNewLine = true; let startNewLine = true;
this._stopWriting(startNewLine); this._stopWriting(startNewLine);
} else if (event.has_control_modifier()){ } else if (ctrlPressed){
// it is a shortcut, do not write text // it is a shortcut, do not write text
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
} else { } else {
@ -377,8 +378,7 @@ var DrawingArea = new Lang.Class({
return Clutter.EVENT_STOP; return Clutter.EVENT_STOP;
} else if (this.currentElement && this.currentElement.shape == Shapes.LINE) { } else if (this.currentElement && this.currentElement.shape == Shapes.LINE) {
if (event.get_key_symbol() == Clutter.KEY_Return || event.get_key_symbol() == 65421 || event.get_key_symbol() == 65507) { if (keySymbol == Clutter.KEY_Return || keySymbol == Clutter.KEY_KP_Enter || keySymbol == Clutter.KEY_Control_L) {
// 65507 is 'Ctrl' key alone
if (this.currentElement.points.length == 2) if (this.currentElement.points.length == 2)
this.emit('show-osd', null, _("Press <i>%s</i> to get a fourth control point") this.emit('show-osd', null, _("Press <i>%s</i> to get a fourth control point")
.format(Gtk.accelerator_get_label(Clutter.KEY_Return, 0)), "", -1); .format(Gtk.accelerator_get_label(Clutter.KEY_Return, 0)), "", -1);
@ -392,11 +392,11 @@ var DrawingArea = new Lang.Class({
} 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() == 65421)) { (keySymbol == Clutter.KEY_Return || keySymbol == 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) { } else if (keySymbol == Clutter.KEY_Escape) {
if (this.helper.visible) if (this.helper.visible)
this.helper.hideHelp(); this.helper.hideHelp();
else else