[gnome-shell] panelMenu: Use the accessible-name property instead of a label actor
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] panelMenu: Use the accessible-name property instead of a label actor
- Date: Tue, 13 Aug 2013 15:22:18 +0000 (UTC)
commit 33e51cc38b51c0193c4ce8944576da8330127018
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Aug 13 07:56:43 2013 -0400
panelMenu: Use the accessible-name property instead of a label actor
We already have code for this in StWidget.
https://bugzilla.gnome.org/show_bug.cgi?id=705898
js/ui/panel.js | 2 +-
js/ui/panelMenu.js | 19 +------------------
2 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/js/ui/panel.js b/js/ui/panel.js
index face8c0..ed4931f 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -521,7 +521,7 @@ const AppMenuButton = new Lang.Class({
this._targetApp = targetApp;
this._label.setText(targetApp.get_name());
- this.setName(targetApp.get_name());
+ this.actor.set_accessible_name(targetApp.get_name());
this._syncIcon();
this._arrow.show();
diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 118ed39..6f68104 100644
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -101,6 +101,7 @@ const Button = new Lang.Class({
this.parent({ reactive: true,
can_focus: true,
track_hover: true,
+ accessible_name: nameText ? nameText : "",
accessible_role: Atk.Role.MENU });
this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
@@ -111,8 +112,6 @@ const Button = new Lang.Class({
this.menu = new PopupMenu.PopupDummyMenu(this.actor);
else
this.setMenu(new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0));
-
- this.setName(nameText);
},
setSensitive: function(sensitive) {
@@ -121,22 +120,6 @@ const Button = new Lang.Class({
this.actor.track_hover = sensitive;
},
- setName: function(text) {
- if (text != null) {
- // This is the easiest way to provide a accessible name to
- // this widget. The label could be also used for other
- // purposes in the future.
- if (!this.label) {
- this.label = new St.Label({ text: text });
- this.actor.label_actor = this.label;
- } else
- this.label.text = text;
- } else {
- this.label = null;
- this.actor.label_actor = null;
- }
- },
-
setMenu: function(menu) {
if (this.menu)
this.menu.destroy();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]