From 7991a5318957faca06ea94bb2b74218935ddc2d9 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 6 Jul 2017 00:03:12 +0200 Subject: [PATCH] padOsd: Refactor function setting label after edition into separate function https://bugzilla.gnome.org/show_bug.cgi?id=782033 --- js/ui/padOsd.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js index 27dfb6637..bdc381f9d 100644 --- a/js/ui/padOsd.js +++ b/js/ui/padOsd.js @@ -550,18 +550,22 @@ const PadDiagram = new Lang.Class({ this.add_actor(label); }, + _applyLabel: function(label, action, idx, dir, str) { + if (str != null) { + label.set_text(str); + + let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir); + this._allocateChild(label, x, y, arrangement); + } + label.show(); + }, + stopEdition: function (str) { this._editorActor.hide(); if (this._curEdited) { let [label, action, idx, dir] = this._curEdited; - if (str != null) { - label.set_text(str); - - let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir); - this._allocateChild(label, x, y, arrangement); - } - label.show(); + this._applyLabel(label, action, idx, dir, str); this._curEdited = null; } },