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

Revert "volume.js: make slider menu items activatable"

Browse Source 
This reverts commit a50c30a4fd.
This commit is contained in:
Rui Matos 2011-07-20 00:45:29 +01:00
parent d12dd1491f
commit d894dedaf6
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/popupMenu.js
View File

@ -482,8 +482,8 @@ function PopupSliderMenuItem() {
PopupSliderMenuItem.prototype = { PopupSliderMenuItem.prototype = {
__proto__: PopupBaseMenuItem.prototype, __proto__: PopupBaseMenuItem.prototype,
_init: function(value, params) { _init: function(value) {
PopupBaseMenuItem.prototype._init.call(this, params ? params : { activate: false }); PopupBaseMenuItem.prototype._init.call(this, { activate: false });
this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent)); this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));

31
js/ui/status/volume.js
View File

@ -41,7 +41,7 @@ Indicator.prototype = {
this._outputVolumeId = 0; this._outputVolumeId = 0;
this._outputMutedId = 0; this._outputMutedId = 0;
this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false }); this._outputTitle = new PopupMenu.PopupMenuItem(_("Volume"), { reactive: false });
this._outputSlider = new VolumeSliderMenuItem(0); this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output')); this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange)); this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
this.menu.addMenuItem(this._outputTitle); this.menu.addMenuItem(this._outputTitle);
@ -54,7 +54,7 @@ Indicator.prototype = {
this._inputVolumeId = 0; this._inputVolumeId = 0;
this._inputMutedId = 0; this._inputMutedId = 0;
this._inputTitle = new PopupMenu.PopupMenuItem(_("Microphone"), { reactive: false }); this._inputTitle = new PopupMenu.PopupMenuItem(_("Microphone"), { reactive: false });
this._inputSlider = new VolumeSliderMenuItem(0); this._inputSlider = new PopupMenu.PopupSliderMenuItem(0);
this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input')); this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input'));
this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange)); this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
this.menu.addMenuItem(this._inputTitle); this.menu.addMenuItem(this._inputTitle);
@ -231,30 +231,3 @@ Indicator.prototype = {
this.setIcon(this._volumeToIcon(this._output.volume)); this.setIcon(this._volumeToIcon(this._output.volume));
} }
}; };
function VolumeSliderMenuItem() {
this._init.apply(this, arguments);
}
VolumeSliderMenuItem.prototype = {
__proto__: PopupMenu.PopupSliderMenuItem.prototype,
_init: function(value) {
PopupMenu.PopupSliderMenuItem.prototype._init.call(this, value, { activate: true });
this.actor.connect('motion-event', Lang.bind(this, this._onMotionEvent));
},
activate: function(event) {
this._motionEvent(this.actor, event);
this.emit('drag-end');
this.emit('activate', event);
},
_onMotionEvent: function(actor, event) {
let button_pressed = Shell.get_event_state(event) & Clutter.ModifierType.BUTTON1_MASK;
if (button_pressed && !this._dragging)
return this._motionEvent(actor, event);
return false;
}
};